X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fxmlrpcapi.py;h=8b8bd78123d93feb7db75632566de5f3b4f108ed;hb=ecc85e0b923922cf7117d29b380f5284edb88f21;hp=456cd42ddd3977d121a16876b45546b3f71c7e6b;hpb=14ca7e52f6af8accc0ba6e362e2a674ea4579e7f;p=sfa.git diff --git a/sfa/server/xmlrpcapi.py b/sfa/server/xmlrpcapi.py index 456cd42d..8b8bd781 100644 --- a/sfa/server/xmlrpcapi.py +++ b/sfa/server/xmlrpcapi.py @@ -71,7 +71,7 @@ def xmlrpclib_dump(self, value, write): if isinstance(value, Type): f(*args) return - raise TypeError, "cannot marshal %s objects" % type(value) + raise TypeError("cannot marshal %s objects" % type(value)) else: f(*args) @@ -102,7 +102,7 @@ class XmlrpcApi: """ # Look up method if method not in self.methods: - raise SfaInvalidAPIMethod, method + raise SfaInvalidAPIMethod(method) # Get new instance of method try: @@ -111,7 +111,8 @@ class XmlrpcApi: callablemethod = getattr(module, classname)(self) return getattr(module, classname)(self) except (ImportError, AttributeError): - raise SfaInvalidAPIMethod, method + self.logger.log_exc("Error importing method: %s" % method) + raise SfaInvalidAPIMethod(method) def call(self, source, method, *args): """ @@ -151,7 +152,8 @@ class XmlrpcApi: try: result = self.call(source, method, *args) except SfaFault, fault: - result = fault + result = fault + self.logger.log_exc("XmlrpcApi.handle has caught Exception") except Exception, fault: self.logger.log_exc("XmlrpcApi.handle has caught Exception") result = SfaAPIError(fault)