X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldapi.py;h=2524727015b4146284d5503cfd2681e2966d8543;hb=a8a54f34297f76d9379070f0fd2c1bec9f761c47;hp=e7d6a1bc1836febdebab5e5ada458cd64c813dbb;hpb=26d84333b968352f844b47740021dd2a2fcafa41;p=myslice.git diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py index e7d6a1bc..25247270 100644 --- a/manifold/manifoldapi.py +++ b/manifold/manifoldapi.py @@ -31,7 +31,11 @@ class ManifoldAPI: if not result: print "[no/empty result]" elif isinstance (result,str): print "result is '%s'"%result elif isinstance (result,list): print "result is a %d-elts list"%len(result) - else: print "[dont know how to display result]" + elif isinstance (result,dict): + print "result is a dict with %d keys : %s"%(len(result),result.keys()) + for (k,v) in result.iteritems(): print '...',k,':',v + print "result is a dict with %d keys : %s"%(len(result),result.keys()), + 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 # as of march 2013 we work with an API that essentially either returns the value, or raises @@ -62,7 +66,7 @@ class ManifoldAPI: return func def execute_query(request, query): - if not 'manifold' in request.session: + if not 'manifold' in request.session or not 'auth' in request.session['manifold']: print "W: Used hardcoded demo account for execute_query" manifold_api_session_auth = {'AuthMethod': 'password', 'Username': 'demo', 'AuthString': 'demo'} else: