git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bugfix for when trying to quote enumerate types
[plcapi.git]
/
PLC
/
PyCurl.py
diff --git
a/PLC/PyCurl.py
b/PLC/PyCurl.py
index
a494fa7
..
f688bc0
100644
(file)
--- a/
PLC/PyCurl.py
+++ b/
PLC/PyCurl.py
@@
-6,6
+6,7
@@
# Copyright (C) 2006 The Trustees of Princeton University
#
# $Id$
# Copyright (C) 2006 The Trustees of Princeton University
#
# $Id$
+# $URL$
#
import os
#
import os
@@
-15,7
+16,8
@@
from tempfile import NamedTemporaryFile
class PyCurlTransport(xmlrpclib.Transport):
def __init__(self, uri, cert = None, timeout = 300):
class PyCurlTransport(xmlrpclib.Transport):
def __init__(self, uri, cert = None, timeout = 300):
- xmlrpclib.Transport.__init__(self)
+ if hasattr(xmlrpclib.Transport,'__init__'):
+ xmlrpclib.Transport.__init__(self)
self.curl = pycurl.Curl()
# Suppress signals
self.curl = pycurl.Curl()
# Suppress signals
@@
-65,6
+67,7
@@
class PyCurlTransport(xmlrpclib.Transport):
errcode = self.curl.getinfo(pycurl.HTTP_CODE)
response = self.body
self.body = ""
errcode = self.curl.getinfo(pycurl.HTTP_CODE)
response = self.body
self.body = ""
+ errmsg="<no known errmsg>"
except pycurl.error, err:
(errcode, errmsg) = err
except pycurl.error, err:
(errcode, errmsg) = err