simple_ssl_context() is now a helper exposed in module sfa.util.ssl

[sfa.git] / sfa / planetlab / plshell.py

diff --git a/sfa/planetlab/plshell.py b/sfa/planetlab/plshell.py
index a85157f..3806249 100644 (file)
--- 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,7 +89,9 @@ class PlShell:
                 'Username':   str(config.SFA_PLC_USER),
                 'AuthString': str(config.SFA_PLC_PASSWORD),
             }
-            self.proxy = xmlrpclib.Server(url, verbose=False, allow_none=True)
+            self.proxy = xmlrpc.client.ServerProxy(
+                url, verbose=False, allow_none=True,
+                context=simple_ssl_context())
 
     def __getattr__(self, name):
         def func(*args, **kwds):