taking out debug statement from the previous commit

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

diff --git a/sfa/util/method.py b/sfa/util/method.py
index e7a12d8..f24dee5 100644 (file)
--- a/sfa/util/method.py
+++ b/sfa/util/method.py
@@ -6,18 +6,17 @@
 ### $Id$
 ### $URL$
 
-import xmlrpclib
+import os, time
 from types import *
+from types import StringTypes
+import traceback
 import textwrap
-import os
-import time
-import pprint
+import xmlrpclib
 
-from types import StringTypes
 
 from sfa.util.faults import * 
 from sfa.util.parameter import Parameter, Mixed, python_type, xmlrpc_type
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.debug import profile, log
 
 # we inherit object because we use new-style classes for legacy methods
@@ -91,7 +90,7 @@ class Method (object):
             result = self.call(*args, **kwds)
             runtime = time.time() - start
 
-            if self.api.config.GENI_API_DEBUG or hasattr(self, 'message'):
+            if self.api.config.SFA_API_DEBUG or hasattr(self, 'message'):
                 # XX print to some log file
                 # print >> log, "some output"
                    pass
@@ -106,10 +105,8 @@ class Method (object):
             fault.faultString = caller + ": " +  self.name + ": " + fault.faultString
             runtime = time.time() - start
            
-            if self.api.config.GENI_API_DEBUG:
-                # XX print to some log file
-                #print >> log, "Some debugging output"              
-                pass 
+            if self.api.config.SFA_API_DEBUG:
+                traceback.print_exc()
             raise fault