Merge branch 'master' into senslab2

[sfa.git] / sfa / util / method.py

diff --git a/sfa/util/method.py b/sfa/util/method.py
index 4c37c67..b9cd05e 100644 (file)
--- a/sfa/util/method.py
+++ b/sfa/util/method.py
@@ -3,18 +3,14 @@
 #
 #
 
-import os, time
-from types import *
-from types import StringTypes
-import traceback
+import time
+from types import IntType, LongType, StringTypes
 import textwrap
-import xmlrpclib
-
 
 from sfa.util.sfalogging import logger
-from sfa.util.faults import * 
-from sfa.util.parameter import Parameter, Mixed, python_type, xmlrpc_type
-from sfa.trust.auth import Auth
+from sfa.util.faults import SfaFault, SfaInvalidAPIMethod, SfaInvalidArgumentCount, SfaInvalidArgument
+
+from sfa.storage.parameter import Parameter, Mixed, python_type, xmlrpc_type
 
 class Method:
     """
@@ -79,14 +75,12 @@ class Method:
             for name, value, expected in zip(max_args, args, self.accepts):
                 self.type_check(name, value, expected, args)
 
-            if self.api.config.SFA_API_DEBUG:
-                logger.debug("method.__call__ [%s] : BEG %s"%(self.api.interface,methodname))
+            logger.debug("method.__call__ [%s] : BEG %s"%(self.api.interface,methodname))
             result = self.call(*args, **kwds)
 
             runtime = time.time() - start
-            if self.api.config.SFA_API_DEBUG or hasattr(self, 'message'):
-                logger.debug("method.__call__ [%s] : END %s in %02f s (%s)"%\
-                                       (self.api.interface,methodname,runtime,getattr(self,'message',"[no-msg]")))
+            logger.debug("method.__call__ [%s] : END %s in %02f s (%s)"%\
+                             (self.api.interface,methodname,runtime,getattr(self,'message',"[no-msg]")))
 
             return result
 
@@ -249,8 +243,7 @@ class Method:
 
         elif not isinstance(value, expected_type):
             raise SfaInvalidArgument("expected %s, got %s" % \
-                                     (xmlrpc_type(expected_type),
-                                      xmlrpc_type(type(value))),
+                                     (xmlrpc_type(expected_type), xmlrpc_type(type(value))),
                                      name)
 
         # If a minimum or maximum (length, value) has been specified