X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=blobdiff_plain;f=curlwrapper.py;h=a877b07516fe8ff82eee54447a54727298771d8c;hp=4383a70fbafa64370be94e5e3e9ab5e5a531acea;hb=48a73b18fd7daed13c645c1adeddb57b560e7a2d;hpb=7b8fc390afd0349706c45c3ae970770cdf9dceae

diff --git a/curlwrapper.py b/curlwrapper.py
index 4383a70..a877b07 100644
--- a/curlwrapper.py
+++ b/curlwrapper.py
@@ -7,7 +7,7 @@
 
 from subprocess import PIPE, Popen
 from select import select
-import xmlrpclib
+import xmlrpc.client
 import signal
 import os
 
@@ -30,8 +30,8 @@ def retrieve(url, cacert=None, postdata=None, timeout=90):
         command += ('--connect-timeout', str(timeout))
     command += (url, )
     if verbose:
-        print 'Invoking ', command
-        if postdata: print 'with postdata=', postdata
+        print('Invoking ', command)
+        if postdata: print('with postdata=', postdata)
     p = Sopen(command , stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)
     if postdata: p.stdin.write(postdata)
     p.stdin.close()
@@ -45,6 +45,6 @@ def retrieve(url, cacert=None, postdata=None, timeout=90):
     if rc != 0: 
         # when this triggers, the error sometimes doesn't get printed
         logger.log ("curlwrapper: retrieve, got stderr <%s>"%err)
-        raise xmlrpclib.ProtocolError(url, rc, err, postdata)
+        raise xmlrpc.client.ProtocolError(url, rc, err, postdata)
     else: 
         return data