X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fmodpython%2FSfaAggregateModPython.py;h=5d38a553e7d31e3b25861509913cd57ea71cc688;hb=a0ef6e7c91c3c8fa376943d28fec8c5c204a78cd;hp=bb61bb77668ad2749eb1add0f2f39f614052ddea;hpb=99e9f96209b9ebfd1853e7b8902a1a0fe893eaa2;p=sfa.git

diff --git a/sfa/server/modpython/SfaAggregateModPython.py b/sfa/server/modpython/SfaAggregateModPython.py
index bb61bb77..5d38a553 100755
--- a/sfa/server/modpython/SfaAggregateModPython.py
+++ b/sfa/server/modpython/SfaAggregateModPython.py
@@ -9,13 +9,12 @@
 
 import sys
 import traceback
-import xmlrpclib
 from mod_python import apache
 
-from sfa.plc.api import SfaAPI
-from sfa.util.sfalogging import sfa_logger
+from sfa.util.sfalogging import logger
+from sfa.planetlab.server import SfaApi
 
-api = SfaAPI(interface='aggregate')
+api = SfaApi(interface='aggregate')
 
 def handler(req):
     try:
@@ -51,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
-        sfa_logger().log_exc('%r'%err)
+        logger.log_exc('%r'%err)
         return apache.HTTP_INTERNAL_SERVER_ERROR