2to3 -f except

[sfa.git] / sfa / client / manifolduploader.py

diff --git a/sfa/client/manifolduploader.py b/sfa/client/manifolduploader.py
index f8ca0f9..66874ba 100755 (executable)
--- a/sfa/client/manifolduploader.py
+++ b/sfa/client/manifolduploader.py
@@ -25,6 +25,11 @@
 DEFAULT_URL = "http://myslice.onelab.eu:7080"
 DEFAULT_PLATFORM = 'ple'
 
+# starting with 2.7.9 we need to turn off server verification
+import ssl
+try:    turn_off_server_verify = { 'context' : ssl._create_unverified_context() } 
+except: turn_off_server_verify = {}
+
 import xmlrpclib
 import getpass
 
@@ -78,7 +83,10 @@ class ManifoldUploader:
 #        return self._proxy
         url=self.url()
         self.logger.debug("Connecting manifold url %s"%url)
-        return xmlrpclib.ServerProxy(url, allow_none = True)
+        proxy = xmlrpclib.ServerProxy(url, allow_none = True,
+                                      **turn_off_server_verify)
+
+        return proxy
 
     # does the job for one credential
     # expects the credential (string) and an optional message (e.g. hrn) for reporting
@@ -105,7 +113,7 @@ class ManifoldUploader:
             try:
                 self.logger.debug("Using new v2 method forward+annotation@%s %s"%(platform,message))
                 retcod2=manifold.forward (query, annotation)
-            except Exception,e:
+            except Exception as e:
                 # xxx we need a constant constant for UNKNOWN, how about using 1
                 MANIFOLD_UNKNOWN=1
                 retcod2={'code':MANIFOLD_UNKNOWN,'description':"%s"%e}
@@ -121,7 +129,7 @@ class ManifoldUploader:
             self.logger.debug("****** full retcod2")
             for (k,v) in retcod2.items(): self.logger.debug("**** %s: %s"%(k,v))
             return False
-        except Exception, e:
+        except Exception as e:
             if message: self.logger.error("Could not upload %s %s"%(message,e))
             else:        self.logger.error("Could not upload credential %s"%e)
             if self.logger.debugEnabled():