diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2003-06-14 13:30:53 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2003-06-14 13:30:53 (GMT) |
| commit | 1867f244168b0f809c4b8796e374e68c21ba880f (patch) | |
| tree | 8b93e1e58ad41cdab30973483d4ad6e9ccc82116 /Lib/socket.py | |
| parent | bc122625937ab4c8ff6c8d10e835bd17656ec6fd (diff) | |
| download | cpython-1867f244168b0f809c4b8796e374e68c21ba880f.zip cpython-1867f244168b0f809c4b8796e374e68c21ba880f.tar.gz cpython-1867f244168b0f809c4b8796e374e68c21ba880f.tar.bz2 | |
Always unwrap _socketobj in socket.ssl. Revert httplib.py 1.25.
Fixes #754447.
Diffstat (limited to 'Lib/socket.py')
| -rw-r--r-- | Lib/socket.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Lib/socket.py b/Lib/socket.py index b95c372..8e30ce0 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"): |