Safe changes from xapi-project#20, Part 1: Update URLopener and xmlrpc

XSConsoleMetrics.py

@@ -13,14 +13,17 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-import XenAPI
-import urllib
 import xml.dom.minidom
 
 from XSConsoleAuth import *
 from XSConsoleBases import *
 from XSConsoleLang import *
 
+try:
+	from urllib import URLopener
+except ImportError:
+	from urllib.request import URLopener
+
 class HotMetrics:
     LIFETIME_SECS = 5 # The lifetime of objects in the cache before they are refetched
     SNAPSHOT_SECS = 10 # The number of seconds of metric data to fetch
@@ -138,7 +141,7 @@ def FetchData(self):
 
             httpRequest = 'http://localhost/rrd_updates?session_id=%s&start=%s&host=true' % (sessionID, int(time.time()) - self.SNAPSHOT_SECS)
 
-            socket = urllib.URLopener().open(httpRequest)
+            socket = URLopener().open(httpRequest)
             try:
                 content = socket.read()
             finally:

XSConsoleRemoteTest.py

@@ -13,16 +13,22 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-import os, socket, xmlrpclib
+import os, socket
 
 from XSConsoleBases import *
 from XSConsoleImporter import *
 from XSConsoleLang import *
 from XSConsoleLog import *
 from XSConsoleLayout import *
 
-import SocketServer
-import SimpleXMLRPCServer
+try:
+    import SimpleXMLRPCServer
+    import SocketServer
+    import xmlrpclib
+except:
+    import socketserver as SocketServer
+    import xmlrpc.client as xmlrpclib
+    import xmlrpc.server as SimpleXMLRPCServer
 
 class UnixSimpleXMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
     # Python 2.7's SimpleXMLRPCRequestHandler enables Nagle's algorithm by default