X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplanetlab%2Fplshell.py;h=3806249279fa846ab462293e99d0a8b026076ea2;hb=2b8fb7af76b173ad4ad6583dbedbdf11a49f9549;hp=f544f7a734398e950b8e4f746c88f307f95a366b;hpb=9de8e0494e18f04cca120755d19f0b724d9d65c9;p=sfa.git

diff --git a/sfa/planetlab/plshell.py b/sfa/planetlab/plshell.py
index f544f7a7..38062492 100644
--- a/sfa/planetlab/plshell.py
+++ b/sfa/planetlab/plshell.py
@@ -1,10 +1,10 @@
 import sys
-import xmlrpclib
+import xmlrpc.client
 import socket
-from urlparse import urlparse
+from urllib.parse import urlparse
 
 from sfa.util.sfalogging import logger
-
+from sfa.util.ssl import simple_ssl_context
 
 class PlShell:
     """
@@ -89,12 +89,9 @@ class PlShell:
                 'Username':   str(config.SFA_PLC_USER),
                 'AuthString': str(config.SFA_PLC_PASSWORD),
             }
-            # minimal verification for backwards compat
-            import ssl
-            ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS)
-            ssl_context.verify_mode = ssl.CERT_NONE
-            self.proxy = xmlrpclib.ServerProxy(
-                url, verbose=False, allow_none=True, context=ssl_context)
+            self.proxy = xmlrpc.client.ServerProxy(
+                url, verbose=False, allow_none=True,
+                context=simple_ssl_context())
 
     def __getattr__(self, name):
         def func(*args, **kwds):