be more flexible in the accepted inputs

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

diff --git a/sfa/util/api.py b/sfa/util/api.py
index 65ccc88..f9aed1c 100644 (file)
--- a/sfa/util/api.py
+++ b/sfa/util/api.py
@@ -1,9 +1,6 @@
 #
 # SFA XML-RPC and SOAP interfaces
 #
-### $Id$
-### $URL$
-#
 
 import sys
 import os
@@ -11,14 +8,12 @@ import traceback
 import string
 import xmlrpclib
 
-import sfa.util.sfalogging
+from sfa.util.sfalogging import sfa_logger
 from sfa.trust.auth import Auth
 from sfa.util.config import *
 from sfa.util.faults import *
-from sfa.util.debug import *
 from sfa.trust.credential import *
 from sfa.trust.certificate import *
-from sfa.util.namespace import *
 
 # See "2.2 Characters" in the XML specification:
 #
@@ -148,7 +143,7 @@ class BaseAPI:
         self.credential = None
         self.source = None 
         self.time_format = "%Y-%m-%d %H:%M:%S"
-        self.logger=sfa.util.sfalogging.logger
+        self.logger=sfa_logger
         
         # load registries
         from sfa.server.registry import Registries
@@ -243,7 +238,7 @@ class BaseAPI:
         except SfaFault, fault:
             result = fault 
         except Exception, fault:
-            traceback.print_exc(file = log)
+            sfa_logger().log_exc("BaseAPI.handle has caught Exception")
             result = SfaAPIError(fault)