Changes between Version 124 and Version 125 of XmlRpcPlugin

Timestamp:

Apr 21, 2021, 1:31:54 AM (3 years ago)

Author:

Jun Omae

Comment:

Use Request(url, request_body) since .add_data(request_body) is deprecated

XmlRpcPlugin

@@ -132 +132 @@
 
 {{{#!python 
-import xmlrpclib 
-         
+try:
+    from xmlrpc import client as xmlrpclib
+except ImportError:
+    import xmlrpclib 
+
 server = xmlrpclib.ServerProxy("http://athomas:password@localhost/trac-dev/login/xmlrpc") 
 for method in server.system.listMethods(): 
@@ -145 +148 @@
 
 {{{#!python 
-import xmlrpclib 
+try:
+    from xmlrpc import client as xmlrpclib
+except ImportError:
+    import xmlrpclib 
 
 server = xmlrpclib.ServerProxy("http://athomas:password@localhost/trac/devel/login/xmlrpc") 
@@ -163 +169 @@
 
 {{{#!python 
-import xmlrpclib 
+try:
+    from xmlrpc import client as xmlrpclib
+except ImportError:
+    import xmlrpclib 
 
 server = xmlrpclib.ServerProxy("http://athomas:password@localhost/trac/devel/login/xmlrpc") 
@@ -176 +185 @@
 
 {{{#!python 
-import xmlrpclib 
+try:
+    from xmlrpc import client as xmlrpclib
+except ImportError:
+    import xmlrpclib 
 
 server = xmlrpclib.ServerProxy("http://athomas:password@localhost/trac-dev/login/xmlrpc") 
@@ -194 +206 @@
 
 {{{#!python 
-import xmlrpclib 
+try:
+    from xmlrpc import client as xmlrpclib
+except ImportError:
+    import xmlrpclib 
  
 server = xmlrpclib.ServerProxy("http://athomas:password@localhost:8080/trunk/login/xmlrpc") 
@@ -206 +221 @@
 
 {{{#!python
+try:
+    from xmlrpc import client as xmlrpclib
+except ImportError:
+    import xmlrpclib 
+    import urllib2
+else:
+    from urllib import request as urllib2
+
 class HTTPSDigestTransport(xmlrpclib.SafeTransport):
     """
@@ -221 +244 @@
 
     def request(self, host, handler, request_body, verbose):
-        import urllib2
-
         url = 'https://'+host+handler
         if verbose or self.verbose:
             print "ProxyTransport URL: [%s]"%url
 
-        request = urllib2.Request(url)
-        request.add_data(request_body)
+        request = urllib2.Request(url, request_body)
         # Note: 'Host' and 'Content-Length' are added automatically
         request.add_header("User-Agent", self.user_agent)