applied the except and raise fixers to the master branch to close the gap with py3

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

diff --git a/src/nepi/util/manifoldapi.py b/src/nepi/util/manifoldapi.py
index c9ff344..5827d4f 100644 (file)
--- a/src/nepi/util/manifoldapi.py
+++ b/src/nepi/util/manifoldapi.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,6 +16,8 @@
 #
 # Author: Lucia Guevgeozian Odizzio <lucia.guevgeozian_odizzio@inria.fr>
 
+from __future__ import print_function
+
 import xmlrpclib
 import hashlib
 import threading
@@ -51,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)
@@ -135,7 +136,7 @@ class MANIFOLDAPI(object):
             return True
         else:
             msg = "Failed while trying to add %s to slice" % resource_urn
-            print msg
+            print(msg)
             # check how to do warning
             return False