2to3 -f except

[sfa.git] / sfa / server / modpython / SfaSliceMgrModPython.py

diff --git a/sfa/server/modpython/SfaSliceMgrModPython.py b/sfa/server/modpython/SfaSliceMgrModPython.py
index 7ad8e0d..dcb8562 100755 (executable)
--- a/sfa/server/modpython/SfaSliceMgrModPython.py
+++ b/sfa/server/modpython/SfaSliceMgrModPython.py
@@ -9,26 +9,12 @@
 
 import sys
 import traceback
-import xmlrpclib
 from mod_python import apache
 
-from sfa.plc.api import SfaAPI
-from sfa.util.debug import log
+from sfa.util.sfalogging import logger
+from sfa.planetlab.server import SfaApi
 
-api = SfaAPI(interface='slicemgr')
-
-class unbuffered:
-    """\r
-    Write to /var/log/httpd/error_log. See\r
-\r
-    http://www.modpython.org/FAQ/faqw.py?req=edit&file=faq02.003.htp\r
-    """\r
-\r
-    def write(self, data):\r
-        sys.stderr.write(data)\r
-        sys.stderr.flush()\r
-\r
-#log = unbuffered()
+api = SfaApi(interface='slicemgr')
 
 def handler(req):
     try:
@@ -64,7 +50,7 @@ def handler(req):
 
         return apache.OK
 
-    except Exception, err:
+    except Exception as err:
         # Log error in /var/log/httpd/(ssl_)?error_log
-        print >> log, err, traceback.format_exc()
+        logger.log_exc('%r'%err)
         return apache.HTTP_INTERNAL_SERVER_ERROR