diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-05-04 18:57:49 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-05-04 18:57:49 -0500 |
| commit | c2660a4ddc3785e6e8e48b5e6fbf6e1602e16777 (patch) | |
| tree | 10e92ce50092889debe3ddf6329f5f07c3d385ed | |
| parent | 7cbd57a4281bd3b4a93479716b7a743257b4475f (diff) | |
| download | bcfg2-c2660a4ddc3785e6e8e48b5e6fbf6e1602e16777.tar.gz bcfg2-c2660a4ddc3785e6e8e48b5e6fbf6e1602e16777.tar.bz2 bcfg2-c2660a4ddc3785e6e8e48b5e6fbf6e1602e16777.zip | |
Proxy: Fix HTTPConnection for >= python 3.2
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| -rw-r--r-- | src/lib/Bcfg2/Proxy.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Proxy.py b/src/lib/Bcfg2/Proxy.py index b2b9fcc2e..ca219af7e 100644 --- a/src/lib/Bcfg2/Proxy.py +++ b/src/lib/Bcfg2/Proxy.py @@ -24,6 +24,7 @@ from Bcfg2.Compat import httplib, xmlrpclib, urlparse, quote_plus version = sys.version_info[:2] has_py26 = version >= (2, 6) +has_py32 = version >= (3, 2) __all__ = ["ComponentProxy", "RetryMethod", @@ -173,8 +174,12 @@ class SSLHTTPConnection(httplib.HTTPConnection): """ if not has_py26: httplib.HTTPConnection.__init__(self, host, port, strict) - else: + elif not has_py32: httplib.HTTPConnection.__init__(self, host, port, strict, timeout) + else: + # the strict parameter is deprecated. + # HTTP 0.9-style “Simple Responses” are not supported anymore. + httplib.HTTPConnection.__init__(self, host, port, timeout=timeout) self.key = key self.cert = cert self.ca = ca |