From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 20 Nov 2013 15:51:13 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.3-0~113^2~7
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=dc832ad1a26a47483f8297678a9417640b7c9925;hp=-c;p=unfold.git

Merge branch 'master' of ssh://git.onelab.eu/git/myslice
---

dc832ad1a26a47483f8297678a9417640b7c9925
diff --combined README
index 7bcba427,3c0f943a..2a183a89
--- a/README
+++ b/README
@@@ -9,8 -9,6 +9,8 @@@ See the devel/ subdir for more devel-or
  *  REQUIREMENTS  is to have python + django (1.5.2) installed django
  ** should be straightforward
  ** see devel/django-install.txt in case of trouble
 +$ apt-get install python-django
 +$ apt-get install python-django-south
  
  * git clone git://git.onelab.eu/myslice.git
  -- or --
@@@ -18,6 -16,7 +18,7 @@@
  
  * edit myslice/config.py and enter the details of your manifold backend
  
+ $ apt-get install python-django-south
  * init django
  $ ./manage.py syncdb
  $ ./manage.py migrate
@@@ -45,7 -44,7 +46,7 @@@ $ make redo == make redo-static redo-te
  
  
  * run a local server:
- $ manage.py runserver 0.0.0.0:8000
+ $ ./manage.py runserver 0.0.0.0:8000
  -- or -- my advice:
  $ devel/server-loop.sh
  when you just need to hit ^C yourself when your static files need to be refreshed - see below
diff --combined manifold/manifoldapi.py
index 700a7654,ee1f82ec..6d168bb3
--- a/manifold/manifoldapi.py
+++ b/manifold/manifoldapi.py
@@@ -32,6 -32,12 +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 +47,8 @@@
              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
@@@ -63,11 -70,7 +70,11 @@@
              try:
                  if debug:
                      print "====> ManifoldAPI.%s"%repr(),"url",self.url
 -                    print "=> auth",self.auth
 +                    # No password in the logs
 +                    logAuth = self.auth
 +                    if 'AuthString' in logAuth:
 +                        logAuth['AuthString']="XXX"
 +                    print "=> auth",logAuth
                      print "=> args",args,"kwds",kwds
                  annotations = {
                      'authentication': self.auth