Skip to content

Add client support for python 3.5+ #418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xschlef wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add client support for python 3.5+ #418

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb47981
Add client support for python 3.5+
xschlef Nov 26, 2019
f27a3e9
Fix assumptions for earlier python versions
xschlef Nov 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/lib/Bcfg2/Client/Proxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
version = sys.version_info[:2]
has_py26 = version >= (2, 6)
has_py32 = version >= (3, 2)
has_py36 = version >= (3, 6)

__all__ = ["ComponentProxy",
"RetryMethod",
Expand Down Expand Up @@ -198,6 +199,14 @@ def connect(self):
ssl_protocol_ver = ssl.PROTOCOL_SSLv23
elif self.protocol == 'xmlrpc/tlsv1':
ssl_protocol_ver = ssl.PROTOCOL_TLSv1
elif self.protocol == 'xmlrpc/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)
Expand All @@ -219,7 +228,7 @@ def connect(self):
self.key = None

rawsock.settimeout(self.timeout)
self.sock = ssl.SSLSocket(rawsock, cert_reqs=other_side_required,
self.sock = ssl.wrap_socket(rawsock, cert_reqs=other_side_required,
ca_certs=self.ca, suppress_ragged_eofs=True,
keyfile=self.key, certfile=self.cert,
ssl_version=ssl_protocol_ver)
Expand Down