From 89feabc7f5308e3190909f47fce225df28a65062 Mon Sep 17 00:00:00 2001 From: Skip Montanaro Date: Sun, 30 Mar 2003 04:54:24 +0000 Subject: The socket module now always uses the _socketobject wrapper class, even on platforms which have dup(2). The makefile() method is built directly on top of the socket without duplicating the file descriptor, allowing timeouts to work properly. Includes a new test case (urllibnet) which requires the network resource. Closes bug 707074. --- Lib/socket.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'Lib/socket.py') diff --git a/Lib/socket.py b/Lib/socket.py index a8a4e39d5a1..cb0181b2a6c 100644 --- a/Lib/socket.py +++ b/Lib/socket.py @@ -59,13 +59,10 @@ if _have_ssl: __all__.extend(os._get_exports_list(_ssl)) _realsocket = socket -_needwrapper = False if (sys.platform.lower().startswith("win") or (hasattr(os, 'uname') and os.uname()[0] == "BeOS") or sys.platform=="riscos"): - _needwrapper = True - if _have_ssl: _realssl = ssl def ssl(sock, keyfile=None, certfile=None): @@ -180,8 +177,7 @@ class _socketobject(object): exec _s % (_m, _m, _m, _m) del _m, _s -if _needwrapper: - socket = SocketType = _socketobject +socket = SocketType = _socketobject class _fileobject(object): """Faux file object attached to a socket object.""" -- cgit v1.2.3