a first very rough step towards python3

[nepi.git] / src / nepi / util / manifoldapi.py

diff --git a/src/nepi/util/manifoldapi.py b/src/nepi/util/manifoldapi.py
index 9630127..43acf58 100644 (file)
--- a/src/nepi/util/manifoldapi.py
+++ b/src/nepi/util/manifoldapi.py
@@ -16,9 +16,9 @@
 #
 # Author: Lucia Guevgeozian Odizzio <lucia.guevgeozian_odizzio@inria.fr>
 
-from __future__ import print_function
 
-import xmlrpclib
+
+import xmlrpc.client
 import hashlib
 import threading
 
@@ -38,7 +38,7 @@ class MANIFOLDAPI(object):
 
     @property
     def api(self):
-        return xmlrpclib.Server(self._url, allow_none = True)
+        return xmlrpc.client.Server(self._url, allow_none = True)
 
     def get_session_key(self):
         """
@@ -52,7 +52,7 @@ class MANIFOLDAPI(object):
 
         if not session['value']:
             msg = "Can not authenticate in Manifold API"
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         session_key = session['value'][0]['session']
         return dict(AuthMethod='session', session=session_key)
@@ -72,7 +72,7 @@ class MANIFOLDAPI(object):
             filters = self._map_attr_to_resource_filters(filters)
 
             qfilters = list()
-            for filtername, filtervalue in filters.iteritems():
+            for filtername, filtervalue in filters.items():
                 newfilter = [filtername, "==", filtervalue]
                 qfilters.append(newfilter)
             
@@ -202,7 +202,7 @@ class MANIFOLDAPI(object):
         }
 
         mapped_filters = dict()
-        for filtername, filtervalue in filters.iteritems():
+        for filtername, filtervalue in filters.items():
             if attr_to_filter[filtername]:
                 new_filtername = attr_to_filter[filtername]
                 mapped_filters[new_filtername] = filtervalue