- result=getattr(self.server, methodName)(self.auth, *args, **kwds)
- ### attempt to cope with old APIs and new APIs
- if isinstance (result, dict) and 'code' in result:
- # this sounds like a result from a new API, leave it untouched
- # XXX jordan : we need to wrap it into a ResultValue structure
- # XXX this is not good until we merge both repos
- if result['code'] != 2:
- return ManifoldResult(code=result['code'], value=result['result'])
- else:
- return ManifoldResult(code=result['code'], output=result['description'])
- else:
- if debug:
- print '<=== backend call', methodName, args, kwds
- print '.... ctd', 'Authmethod=',self.auth['AuthMethod'], self.url,'->',
- 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]"
- return ManifoldResult (code=ManifoldCode.SUCCESS, value=result)
- except xmlrpclib.Fault, error:
- ### xxx this is very rough for now
- # until we have some agreement about how the API calls should return error conditions
- # in some less unpolite way than this anonymous exception, we assume it's a problem with the session
- # that needs to be refreshed
- if error.faultCode == 8002:
- reason="most likely your session has expired"
- reason += " (the manifold API has no unambiguous error reporting mechanism yet)"
- return ManifoldResult (code=ManifoldCode.SESSION_EXPIRED, output=reason)
- else:
- reason="xmlrpclib.Fault with faultCode = %s (not taken as session expired)"%error.faultCode
- return ManifoldResult (code=ManifoldCode.UNKNOWN_ERROR, output=reason)
+ if debug:
+ print "====> ManifoldAPI.%s"%repr(),"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 '<= result=',
+ self._print_result(result)
+ print '<==== backend call %s returned'%(repr()),
+
+ return ResultValue(**result)
+