X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=manifold%2Fmanifoldapi.py;h=1ba0db4275bb8806bf785959c3f468844437cafa;hb=1710230d6c76a139ae890d16767458cb8543ea35;hp=35fd3d74e7c5bbd901fd51174dd2d937e2bfe114;hpb=a1334d41a53aec4a8bf2ebd7f3c67244eb8ac1a8;p=myslice.git diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py index 35fd3d74..1ba0db42 100644 --- a/manifold/manifoldapi.py +++ b/manifold/manifoldapi.py @@ -54,8 +54,14 @@ class ManifoldAPI: def func(*args, **kwds): try: if debug: - print "====> ManifoldAPI.%s"%methodName,"auth",self.auth,"args",args,"kwds",kwds - result=getattr(self.server, methodName)(self.auth, *args, **kwds) + print "====> ManifoldAPI.%s"%methodName,"url",self.url + print "=> auth",self.auth + print "=> args",args,"kwds",kwds + annotations = { + 'authentication': self.auth + } + args += (annotations,) + result=getattr(self.server, methodName)(*args, **kwds) if debug: print '<==== backend call %s(*%s,**%s) returned'%(methodName,args,kwds), print '.ctd. Authmethod=',self.auth['AuthMethod'], self.url,'->', @@ -74,6 +80,7 @@ class ManifoldAPI: import traceback traceback.print_exc() if debug: print "KO (unexpected exception)",error + print '===== ManifoldAPI call exiting' raise ManifoldException ( ManifoldResult (code=ManifoldCode.UNKNOWN_ERROR, output="%s"%error) ) return func