Dan Kenigsberg has uploaded a new change for review. Change subject: janitorial: sslutils, kaxmlrpclib: drop python-2.6-specific code ......................................................................
janitorial: sslutils, kaxmlrpclib: drop python-2.6-specific code Change-Id: Icdb4ba3a52a144d7d28d9d8adf36e8b0621f10dd Signed-off-by: Dan Kenigsberg <[email protected]> --- M lib/vdsm/sslutils.py M vdsm/kaxmlrpclib.py 2 files changed, 12 insertions(+), 64 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/64/40964/1 diff --git a/lib/vdsm/sslutils.py b/lib/vdsm/sslutils.py index 4b863a7..7e9319a 100644 --- a/lib/vdsm/sslutils.py +++ b/lib/vdsm/sslutils.py @@ -112,52 +112,13 @@ self._timeout = timeout def make_connection(self, host): - """Return VerifyingHTTPS object that is aware of ca_certs, and will - create VerifyingHTTPSConnection. - In Python 2.7, return VerifyingHTTPSConnection object - """ + """Return a VerifyingHTTPSConnection object""" chost, self._extra_headers, x509 = self.get_host_info(host) - if hasattr(xmlrpclib.SafeTransport, "single_request"): # Python 2.7 - return VerifyingHTTPSConnection( - chost, None, key_file=self.key_file, strict=None, - cert_file=self.cert_file, timeout=self._timeout, - ca_certs=self.ca_certs, - cert_reqs=self.cert_reqs) - else: - return VerifyingHTTPS( - chost, None, key_file=self.key_file, - cert_file=self.cert_file, timeout=self._timeout, - ca_certs=self.ca_certs, - cert_reqs=self.cert_reqs) - - -class VerifyingHTTPS(httplib.HTTPS): - _connection_class = VerifyingHTTPSConnection - - def __init__(self, host='', port=None, key_file=None, cert_file=None, - strict=None, timeout=SOCKET_DEFAULT_TIMEOUT, - ca_certs=None, cert_reqs=ssl.CERT_REQUIRED): - """A ca_cert-aware HTTPS object, - that creates a VerifyingHTTPSConnection - """ - # provide a default host, pass the X509 cert info - - # urf. compensate for bad input. - if port == 0: - port = None - self._setup(self._connection_class(host=host, - port=port, - key_file=key_file, - cert_file=cert_file, - strict=strict, - timeout=timeout, - ca_certs=ca_certs, - cert_reqs=cert_reqs)) - - # we never actually use these for anything, but we keep them - # here for compatibility with post-1.5.2 CVS. - self.key_file = key_file - self.cert_file = cert_file + return VerifyingHTTPSConnection( + chost, None, key_file=self.key_file, strict=None, + cert_file=self.cert_file, timeout=self._timeout, + ca_certs=self.ca_certs, + cert_reqs=self.cert_reqs) class SSLHandshakeDispatcher(object): diff --git a/vdsm/kaxmlrpclib.py b/vdsm/kaxmlrpclib.py index 6374726..e5ff677 100644 --- a/vdsm/kaxmlrpclib.py +++ b/vdsm/kaxmlrpclib.py @@ -57,10 +57,7 @@ class TcpkeepTransport(xmlrpclib.Transport): def make_connection(self, host): - if hasattr(xmlrpclib.Transport, "single_request"): # Python 2.7 - return TcpkeepHTTPConnection(host) - else: - return TcpkeepHTTP(host) + return TcpkeepHTTPConnection(host) class TcpkeepHTTPConnection(httplib.HTTPConnection): @@ -126,17 +123,11 @@ def make_connection(self, host): chost, self._extra_headers, x509 = self.get_host_info(host) - if hasattr(xmlrpclib.SafeTransport, "single_request"): # Python 2.7 - return TcpkeepHTTPSConnection( - chost, None, key_file=self.key_file, strict=None, - timeout=CONNECTTIMEOUT, - cert_file=self.cert_file, ca_certs=self.ca_certs, - cert_reqs=self.cert_reqs) - else: - return TcpkeepHTTPS( - chost, None, key_file=self.key_file, - cert_file=self.cert_file, ca_certs=self.ca_certs, - cert_reqs=self.cert_reqs) + return TcpkeepHTTPSConnection( + chost, None, key_file=self.key_file, strict=None, + timeout=CONNECTTIMEOUT, + cert_file=self.cert_file, ca_certs=self.ca_certs, + cert_reqs=self.cert_reqs) class TcpkeepHTTPSConnection(sslutils.VerifyingHTTPSConnection): @@ -158,7 +149,3 @@ self.sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPIDLE, KEEPIDLE) self.sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPINTVL, KEEPINTVL) self.sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPCNT, KEEPCNT) - - -class TcpkeepHTTPS(sslutils.VerifyingHTTPS): - _connection_class = TcpkeepHTTPSConnection -- To view, visit https://gerrit.ovirt.org/40964 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icdb4ba3a52a144d7d28d9d8adf36e8b0621f10dd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
