X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldapi.py;h=1b97505dec9c2e44cd9d726a97975b0ff8026d69;hb=d1197c134b70bda643a752bdaf891190cb5a15e7;hp=700a7654c0851d58dff23657af45ba6655ef58d2;hpb=4805b1478e681cd2304c156a7869225623649c2f;p=myslice.git

diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py
index 700a7654..1b97505d 100644
--- a/manifold/manifoldapi.py
+++ b/manifold/manifoldapi.py
@@ -1,5 +1,5 @@
 # Manifold API Python interface
-import xmlrpclib
+import copy, xmlrpclib
 
 from myslice.config import Config
 
@@ -32,6 +32,12 @@ class ManifoldAPI:
 
     def __repr__ (self): return "ManifoldAPI[%s]"%self.url
 
+    def _print_value (self, value):
+        print "+++",'value',
+        if isinstance (value,list):     print "[%d]"%len(value),
+        elif isinstance (value,dict):   print "{%d}"%len(value),
+        print mytruncate (value,80)
+    
     # a one-liner to give a hint of what the return value looks like
     def _print_result (self, result):
         if not result:                        print "[no/empty result]"
@@ -41,7 +47,8 @@ class ManifoldAPI:
             print "result is a dict with %d keys : %s"%(len(result),result.keys())
             for (k,v) in result.iteritems(): 
                 if v is None: continue
-                print '+++',k,':',mytruncate (v,60)
+                if k=='value':  self._print_value(v)
+                else:           print '+++',k,':',mytruncate (v,30)
         else:                                 print "[dont know how to display result] %s"%result
 
     # xxx temporary code for scaffolding a ManifolResult on top of an API that does not expose error info
@@ -64,7 +71,7 @@ class ManifoldAPI:
                 if debug:
                     print "====> ManifoldAPI.%s"%repr(),"url",self.url
                     # No password in the logs
-                    logAuth = self.auth
+                    logAuth = copy.copy(self.auth)
                     if 'AuthString' in logAuth:
                         logAuth['AuthString']="XXX"
                     print "=> auth",logAuth
@@ -74,6 +81,8 @@ class ManifoldAPI:
                 }
                 args += (annotations,)
                 result=getattr(self.server, methodName)(*args, **kwds)
+                print "%s%r" %(methodName, args)
+                
                 if debug:
                     print '<= result=',
                     self._print_result(result)