diff options
| author | Johannes Kampmeyer <joka@uni-paderborn.de> | 2019-11-26 09:03:58 +0100 |
|---|---|---|
| committer | casept <davids.paskevics@gmail.com> | 2024-01-31 13:12:50 +0000 |
| commit | 2bec5c6c9f20ddae2a15f222719e6a05d59e80ad (patch) | |
| tree | aab51b87cf10f76a96c67755f281c6d026ac968d | |
| parent | c7ead39f0e9f7d0de5f6265357328f5d150848af (diff) | |
| download | bcfg2-2bec5c6c9f20ddae2a15f222719e6a05d59e80ad.tar.gz bcfg2-2bec5c6c9f20ddae2a15f222719e6a05d59e80ad.tar.bz2 bcfg2-2bec5c6c9f20ddae2a15f222719e6a05d59e80ad.zip | |
Fix assumptions for earlier python versions
| -rw-r--r-- | src/lib/Bcfg2/Client/Proxy.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Client/Proxy.py b/src/lib/Bcfg2/Client/Proxy.py index fe9f47f17..9ffae49d8 100644 --- a/src/lib/Bcfg2/Client/Proxy.py +++ b/src/lib/Bcfg2/Client/Proxy.py @@ -21,6 +21,7 @@ except ImportError: version = sys.version_info[:2] has_py26 = version >= (2, 6) has_py32 = version >= (3, 2) +has_py36 = version >= (3, 6) __all__ = ["ComponentProxy", "RetryMethod", @@ -199,8 +200,13 @@ class SSLHTTPConnection(httplib.HTTPConnection): elif self.protocol == 'xmlrpc/tlsv1': ssl_protocol_ver = ssl.PROTOCOL_TLSv1 elif self.protocol == 'xmlrpc/tls': - # needed for python 3.5+ support - ssl_protocol_ver = ssl.PROTOCOL_TLS + if has_py36: + ssl_protocol_ver = ssl.PROTOCOL_TLS + else: + self.logger.warning("Cannot use PROTOCOL_TLS, due to " + "python version. Switching to " + "PROTOCOL_TLSv1.") + ssl_protocol_ver = ssl.PROTOCOL_TLSv1 else: self.logger.error("Unknown protocol %s" % (self.protocol)) raise Exception("unknown protocol %s" % self.protocol) |