diff options
| -rw-r--r-- | Lib/httplib.py | 5 | ||||
| -rw-r--r-- | Lib/socket.py | 16 |
2 files changed, 7 insertions, 14 deletions
diff --git a/Lib/httplib.py b/Lib/httplib.py index efd48423cc..7eb9ad7649 100644 --- a/Lib/httplib.py +++ b/Lib/httplib.py @@ -956,10 +956,7 @@ class HTTPSConnection(HTTPConnection): sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock.connect((self.host, self.port)) - realsock = sock - if hasattr(sock, "_sock"): - realsock = sock._sock - ssl = socket.ssl(realsock, self.key_file, self.cert_file) + ssl = socket.ssl(sock, self.key_file, self.cert_file) self.sock = FakeSocket(sock, ssl) diff --git a/Lib/socket.py b/Lib/socket.py index b95c372da5..8e30ce0a34 100644 --- a/Lib/socket.py +++ b/Lib/socket.py @@ -65,16 +65,12 @@ if _have_ssl: __all__.extend(os._get_exports_list(_ssl)) _realsocket = socket -if (sys.platform.lower().startswith("win") - or (hasattr(os, 'uname') and os.uname()[0] == "BeOS") - or sys.platform=="riscos"): - - if _have_ssl: - _realssl = ssl - def ssl(sock, keyfile=None, certfile=None): - if hasattr(sock, "_sock"): - sock = sock._sock - return _realssl(sock, keyfile, certfile) +if _have_ssl: + _realssl = ssl + def ssl(sock, keyfile=None, certfile=None): + if hasattr(sock, "_sock"): + sock = sock._sock + return _realssl(sock, keyfile, certfile) # WSA error codes if sys.platform.lower().startswith("win"): |