diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2009-05-15 04:10:44 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2009-05-15 04:10:44 +0000 |
| commit | d277598beb3f55fdfe5a905a653a830845eff768 (patch) | |
| tree | cffc78e41313f5f275315ba3201a056dc1a41d54 /src/lib/Proxy.py | |
| parent | fae52ae9801b12c11fdff55d5dd0cf4bbfa829d2 (diff) | |
| download | bcfg2-d277598beb3f55fdfe5a905a653a830845eff768.tar.gz bcfg2-d277598beb3f55fdfe5a905a653a830845eff768.tar.bz2 bcfg2-d277598beb3f55fdfe5a905a653a830845eff768.zip | |
pylint fixes
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5240 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Proxy.py')
| -rw-r--r-- | src/lib/Proxy.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Proxy.py b/src/lib/Proxy.py index d7d9b9028..2dd1b0065 100644 --- a/src/lib/Proxy.py +++ b/src/lib/Proxy.py @@ -57,9 +57,9 @@ xmlrpclib._Method = RetryMethod class SSLHTTPConnection(httplib.HTTPConnection): def __init__(self, host, port=None, strict=None, timeout=90, key=None, cert=None, ca=None): - if not has_py26: + if not has_py26: httplib.HTTPConnection.__init__(self, host, port, strict) - else: + else: httplib.HTTPConnection.__init__(self, host, port, strict, timeout) self.key = key self.cert = cert @@ -71,7 +71,7 @@ class SSLHTTPConnection(httplib.HTTPConnection): def connect(self): rawsock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - if has_py26: + if has_py26: rawsock.settimeout(self.timeout) self.sock = ssl.SSLSocket(rawsock, cert_reqs=self.ca_mode, ca_certs=self.ca, suppress_ragged_eofs=True, @@ -107,7 +107,7 @@ class XMLRPCTransport(xmlrpclib.Transport): msglen = int(headers.dict['content-length']) if errcode != 200: - raise ProtocolError(host + handler, errcode, errmsg, headers) + raise xmlrpclib.ProtocolError(host + handler, errcode, errmsg, headers) self.verbose = verbose |