Mailman 3 May 2008 - Python-checkins

buildbot failure in x86 XP-4 3.0
by buildbot＠python.org May 29, 2008

May 29, 2008

The Buildbot has detected a new failure of x86 XP-4 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20XP-4%203.0/builds/762 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: bolen-windows Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: amaury.forgeotdarc,benjamin.peterson,brett.cannon,christian.heimes,georg.brandl,guilherme.polo,martin.v.loewis,thomas.heller BUILD FAILED: failed test Excerpt from the test logfile: Traceback (most recent call last): File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 281, in _handle_request_noblock self.process_request(request, client_address) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 307, in process_request self.finish_request(request, client_address) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 320, in finish_request self.RequestHandlerClass(request, client_address, self) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 614, in __init__ self.handle() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 364, in handle self.handle_one_request() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 358, in handle_one_request method() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 617, in do_GET f = self.send_head() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 849, in send_head return self.run_cgi() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 1102, in run_cgi exec(open(scriptfile).read(), {"__name__": "__main__"}) File "<string>", line 3, in <module> File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socket.py", line 222, in write return self._sock.send(b) TypeError: send() argument 1 must be bytes or read-only buffer, not str Traceback (most recent call last): File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 281, in _handle_request_noblock self.process_request(request, client_address) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 307, in process_request self.finish_request(request, client_address) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 320, in finish_request self.RequestHandlerClass(request, client_address, self) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 614, in __init__ self.handle() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 364, in handle self.handle_one_request() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 358, in handle_one_request method() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 617, in do_GET f = self.send_head() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 849, in send_head return self.run_cgi() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 1102, in run_cgi exec(open(scriptfile).read(), {"__name__": "__main__"}) File "<string>", line 3, in <module> File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socket.py", line 222, in write return self._sock.send(b) TypeError: send() argument 1 must be bytes or read-only buffer, not str Traceback (most recent call last): File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 281, in _handle_request_noblock self.process_request(request, client_address) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 307, in process_request self.finish_request(request, client_address) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 320, in finish_request self.RequestHandlerClass(request, client_address, self) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 614, in __init__ self.handle() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 364, in handle self.handle_one_request() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 358, in handle_one_request method() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 842, in do_POST self.run_cgi() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 1102, in run_cgi exec(open(scriptfile).read(), {"__name__": "__main__"}) File "<string>", line 4, in <module> File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socket.py", line 222, in write return self._sock.send(b) TypeError: send() argument 1 must be bytes or read-only buffer, not str 2 tests failed: test_httpservers test_pydoc ====================================================================== ERROR: test_post (test.test_httpservers.CGIHTTPServerTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\test\test_httpservers.py", line 325, in test_post res = self.request('/cgi-bin/file2.py', 'POST', params, headers) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\test\test_httpservers.py", line 63, in request return self.connection.getresponse() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\client.py", line 975, in getresponse response.begin() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\client.py", line 424, in begin self.msg = HTTPMessage(self.fp, 0) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\mimetools.py", line 16, in __init__ rfc822.Message.__init__(self, fp, seekable) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\rfc822.py", line 104, in __init__ self.readheaders() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\client.py", line 266, in readheaders line = str(self.fp.readline(), "iso-8859-1") File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\io.py", line 510, in readline b = self.read(nreadahead()) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\io.py", line 577, in read n = self.readinto(b) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socket.py", line 217, in readinto return self._sock.recv_into(b) socket.error: [Errno 10054] An existing connection was forcibly closed by the remote host ====================================================================== FAIL: test_authorization (test.test_httpservers.CGIHTTPServerTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\test\test_httpservers.py", line 339, in test_authorization (res.read(), res.getheader('Content-type'), res.status)) AssertionError: (b'Hello World\n', 'text/html', 200) != (b'', None, 200) ====================================================================== FAIL: test_headers_and_content (test.test_httpservers.CGIHTTPServerTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\test\test_httpservers.py", line 320, in test_headers_and_content (res.read(), res.getheader('Content-type'), res.status)) AssertionError: (b'Hello World\n', 'text/html', 200) != (b'', None, 200) ====================================================================== FAIL: test_html_doc (test.test_pydoc.PyDocDocTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\test\test_pydoc.py", line 237, in test_html_doc self.fail("outputs are not equal, see diff above") AssertionError: outputs are not equal, see diff above Traceback (most recent call last): File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 281, in _handle_request_noblock self.process_request(request, client_address) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 307, in process_request self.finish_request(request, client_address) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 320, in finish_request self.RequestHandlerClass(request, client_address, self) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 614, in __init__ self.handle() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 364, in handle self.handle_one_request() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 358, in handle_one_request method() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 617, in do_GET f = self.send_head() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 849, in send_head return self.run_cgi() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 1102, in run_cgi exec(open(scriptfile).read(), {"__name__": "__main__"}) File "<string>", line 3, in <module> File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socket.py", line 222, in write return self._sock.send(b) TypeError: send() argument 1 must be bytes or read-only buffer, not str Traceback (most recent call last): File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 281, in _handle_request_noblock self.process_request(request, client_address) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 307, in process_request self.finish_request(request, client_address) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 320, in finish_request self.RequestHandlerClass(request, client_address, self) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 614, in __init__ self.handle() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 364, in handle self.handle_one_request() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 358, in handle_one_request method() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 617, in do_GET f = self.send_head() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 849, in send_head return self.run_cgi() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 1102, in run_cgi exec(open(scriptfile).read(), {"__name__": "__main__"}) File "<string>", line 3, in <module> File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socket.py", line 222, in write return self._sock.send(b) TypeError: send() argument 1 must be bytes or read-only buffer, not str Traceback (most recent call last): File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 281, in _handle_request_noblock self.process_request(request, client_address) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 307, in process_request self.finish_request(request, client_address) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 320, in finish_request self.RequestHandlerClass(request, client_address, self) File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socketserver.py", line 614, in __init__ self.handle() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 364, in handle self.handle_one_request() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 358, in handle_one_request method() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 842, in do_POST self.run_cgi() File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\http\server.py", line 1102, in run_cgi exec(open(scriptfile).read(), {"__name__": "__main__"}) File "<string>", line 4, in <module> File "E:\cygwin\home\db3l\buildarea\3.0.bolen-windows\build\lib\socket.py", line 222, in write return self._sock.send(b) TypeError: send() argument 1 must be bytes or read-only buffer, not str sincerely, -The Buildbot

1 0

buildbot failure in i386 Ubuntu trunk
by buildbot＠python.org May 29, 2008

May 29, 2008

The Buildbot has detected a new failure of i386 Ubuntu trunk. Full details are available at: http://www.python.org/dev/buildbot/all/i386%20Ubuntu%20trunk/builds/58 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-ubuntu-i386 Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: thomas.heller BUILD FAILED: failed test Excerpt from the test logfile: sincerely, -The Buildbot

1 0

buildbot failure in x86 osx.5 trunk
by buildbot＠python.org May 29, 2008

May 29, 2008

The Buildbot has detected a new failure of x86 osx.5 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20osx.5%20trunk/builds/356 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: heller-x86-osx5 Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: thomas.heller BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_socket make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0

r63792 - in python/trunk: Lib/ctypes/test/test_pointers.py Misc/NEWS Modules/_ctypes/_ctypes.c
by thomas.heller May 29, 2008

May 29, 2008

Author: thomas.heller Date: Thu May 29 21:42:34 2008 New Revision: 63792 Log: ctypes NULL function pointers have a boolean False value now. Modified: python/trunk/Lib/ctypes/test/test_pointers.py python/trunk/Misc/NEWS python/trunk/Modules/_ctypes/_ctypes.c Modified: python/trunk/Lib/ctypes/test/test_pointers.py ============================================================================== --- python/trunk/Lib/ctypes/test/test_pointers.py (original) +++ python/trunk/Lib/ctypes/test/test_pointers.py Thu May 29 21:42:34 2008 @@ -175,5 +175,13 @@ self.assertRaises(TypeError, c_void_p, 3.14) # make sure floats are NOT accepted self.assertRaises(TypeError, c_void_p, object()) # nor other objects + def test_pointers_bool(self): + # NULL pointers have a boolean False value, non-NULL pointers True. + self.failUnlessEqual(bool(POINTER(c_int)()), False) + self.failUnlessEqual(bool(pointer(c_int())), True) + + self.failUnlessEqual(bool(CFUNCTYPE(None)(0)), False) + self.failUnlessEqual(bool(CFUNCTYPE(None)(42)), True) + if __name__ == '__main__': unittest.main() Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Thu May 29 21:42:34 2008 @@ -63,6 +63,9 @@ Library ------- +- Issue #1797 (partial fix): ctypes NULL function pointers have a + False boolean value now. + - Issue #2985: Allow 64-bit integer responses (``<i8>``) in XMLRPC transfers. Modified: python/trunk/Modules/_ctypes/_ctypes.c ============================================================================== --- python/trunk/Modules/_ctypes/_ctypes.c (original) +++ python/trunk/Modules/_ctypes/_ctypes.c Thu May 29 21:42:34 2008 @@ -3784,6 +3784,26 @@ self); } +static int +Pointer_nonzero(CDataObject *self) +{ + return *(void **)self->b_ptr != NULL; +} + +static PyNumberMethods Pointer_as_number = { + 0, /* nb_add */ + 0, /* nb_subtract */ + 0, /* nb_multiply */ + 0, /* nb_divide */ + 0, /* nb_remainder */ + 0, /* nb_divmod */ + 0, /* nb_power */ + 0, /* nb_negative */ + 0, /* nb_positive */ + 0, /* nb_absolute */ + (inquiry)Pointer_nonzero, /* nb_nonzero */ +}; + PyTypeObject CFuncPtr_Type = { PyVarObject_HEAD_INIT(NULL, 0) "_ctypes.CFuncPtr", @@ -3795,7 +3815,7 @@ 0, /* tp_setattr */ 0, /* tp_compare */ (reprfunc)CFuncPtr_repr, /* tp_repr */ - 0, /* tp_as_number */ + &Pointer_as_number, /* tp_as_number */ 0, /* tp_as_sequence */ 0, /* tp_as_mapping */ 0, /* tp_hash */ @@ -5003,26 +5023,6 @@ Pointer_subscript, }; -static int -Pointer_nonzero(CDataObject *self) -{ - return *(void **)self->b_ptr != NULL; -} - -static PyNumberMethods Pointer_as_number = { - 0, /* nb_add */ - 0, /* nb_subtract */ - 0, /* nb_multiply */ - 0, /* nb_divide */ - 0, /* nb_remainder */ - 0, /* nb_divmod */ - 0, /* nb_power */ - 0, /* nb_negative */ - 0, /* nb_positive */ - 0, /* nb_absolute */ - (inquiry)Pointer_nonzero, /* nb_nonzero */ -}; - PyTypeObject Pointer_Type = { PyVarObject_HEAD_INIT(NULL, 0) "_ctypes._Pointer",

1 0

r63791 - python/trunk/Modules/_ctypes/_ctypes.c
by thomas.heller May 29, 2008

May 29, 2008

Author: thomas.heller Date: Thu May 29 21:18:12 2008 New Revision: 63791 Log: Fix compiler warning. Modified: python/trunk/Modules/_ctypes/_ctypes.c Modified: python/trunk/Modules/_ctypes/_ctypes.c ============================================================================== --- python/trunk/Modules/_ctypes/_ctypes.c (original) +++ python/trunk/Modules/_ctypes/_ctypes.c Thu May 29 21:18:12 2008 @@ -477,7 +477,7 @@ static PyObject * CDataType_from_buffer_copy(PyObject *type, PyObject *args) { - void *buffer; + const void *buffer; Py_ssize_t buffer_len; Py_ssize_t offset = 0; PyObject *obj, *result;

1 0

r63790 - sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py
by brett.cannon May 29, 2008

May 29, 2008

Author: brett.cannon Date: Thu May 29 21:13:51 2008 New Revision: 63790 Log: Add a fixer for UserList. Closes issue #2878. Thanks to Quentin Gallet-Gilles for the patch. Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py (original) +++ sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py Thu May 29 21:13:51 2008 @@ -266,6 +266,7 @@ "threading_setup", "threading_cleanup", "reap_children"]), 'commands': ('subprocess', ['getstatusoutput', 'getoutput']), 'UserString' : ('collections', ['UserString']), + 'UserList' : ('collections', ['UserList']), }

1 0

buildbot failure in sparc Ubuntu trunk
by buildbot＠python.org May 29, 2008

May 29, 2008

The Buildbot has detected a new failure of sparc Ubuntu trunk. Full details are available at: http://www.python.org/dev/buildbot/all/sparc%20Ubuntu%20trunk/builds/609 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-ubuntu-sparc Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: facundo.batista BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_socket_ssl make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0

r63789 - peps/trunk/pep-3108.txt
by brett.cannon May 29, 2008

May 29, 2008

Author: brett.cannon Date: Thu May 29 19:22:47 2008 New Revision: 63789 Log: UserString has been dealt with. Modified: peps/trunk/pep-3108.txt Modified: peps/trunk/pep-3108.txt ============================================================================== --- peps/trunk/pep-3108.txt (original) +++ peps/trunk/pep-3108.txt Thu May 29 19:22:47 2008 @@ -639,7 +639,7 @@ + Not as useful since types can be a superclass. + Useful bits moved to the 'collections' module. -* UserList/UserString [done: 3.0] (TODO handle 2.6) +* UserList/UserString [done: 2.6, 3.0] + Not useful since types can be a superclass. + Moved to the 'collections' module.

1 0

buildbot failure in x86 XP-4 trunk
by buildbot＠python.org May 29, 2008

May 29, 2008

The Buildbot has detected a new failure of x86 XP-4 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20XP-4%20trunk/builds/1083 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: bolen-windows Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: georg.brandl BUILD FAILED: failed failed slave lost sincerely, -The Buildbot

1 0

r63788 - in python/trunk: Doc/library/ftplib.rst Doc/library/httplib.rst Doc/library/poplib.rst Doc/library/smtplib.rst Doc/library/socket.rst Doc/library/telnetlib.rst Doc/library/urllib2.rst Lib/ftplib.py Lib/httplib.py Lib/poplib.py Lib/smtplib.py Lib/socket.py Lib/telnetlib.py Lib/test/test_ftplib.py Lib/test/test_httplib.py Lib/test/test_poplib.py Lib/test/test_smtplib.py Lib/test/test_socket.py Lib/test/test_telnetlib.py Lib/test/test_urllib.py Lib/test/test_urllib2.py Lib/test/test_
by facundo.batista May 29, 2008

May 29, 2008

Author: facundo.batista Date: Thu May 29 18:39:26 2008 New Revision: 63788 Log: Fixed the semantic of timeout for socket.create_connection and all the upper level libraries that use it, including urllib2. Added and fixed some tests, and changed docs correspondingly. Thanks to John J Lee for the patch and the pusing, :) Modified: python/trunk/Doc/library/ftplib.rst python/trunk/Doc/library/httplib.rst python/trunk/Doc/library/poplib.rst python/trunk/Doc/library/smtplib.rst python/trunk/Doc/library/socket.rst python/trunk/Doc/library/telnetlib.rst python/trunk/Doc/library/urllib2.rst python/trunk/Lib/ftplib.py python/trunk/Lib/httplib.py python/trunk/Lib/poplib.py python/trunk/Lib/smtplib.py python/trunk/Lib/socket.py python/trunk/Lib/telnetlib.py python/trunk/Lib/test/test_ftplib.py python/trunk/Lib/test/test_httplib.py python/trunk/Lib/test/test_poplib.py python/trunk/Lib/test/test_smtplib.py python/trunk/Lib/test/test_socket.py python/trunk/Lib/test/test_telnetlib.py python/trunk/Lib/test/test_urllib.py python/trunk/Lib/test/test_urllib2.py python/trunk/Lib/test/test_urllib2net.py python/trunk/Lib/urllib.py python/trunk/Lib/urllib2.py Modified: python/trunk/Doc/library/ftplib.rst ============================================================================== --- python/trunk/Doc/library/ftplib.rst (original) +++ python/trunk/Doc/library/ftplib.rst Thu May 29 18:39:26 2008 @@ -44,8 +44,8 @@ the method call ``login(user, passwd, acct)`` is made (where *passwd* and *acct* default to the empty string when not given). The optional *timeout* parameter specifies a timeout in seconds for blocking operations like the - connection attempt (if is not specified, or passed as None, the global - default timeout setting will be used). + connection attempt (if is not specified, the global default timeout setting + will be used). .. versionchanged:: 2.6 *timeout* was added. @@ -126,10 +126,8 @@ made. The optional *timeout* parameter specifies a timeout in seconds for the - connection attempt. If is not specified, or passed as None, the object - timeout is used (the timeout that you passed when instantiating the class); - if the object timeout is also None, the global default timeout setting will - be used. + connection attempt. If no *timeout* is passed, the global default timeout + setting will be used. .. versionchanged:: 2.6 *timeout* was added. Modified: python/trunk/Doc/library/httplib.rst ============================================================================== --- python/trunk/Doc/library/httplib.rst (original) +++ python/trunk/Doc/library/httplib.rst Thu May 29 18:39:26 2008 @@ -44,7 +44,7 @@ be raised if the status line can't be parsed as a valid HTTP/1.0 or 1.1 status line. If the optional *timeout* parameter is given, blocking operations (like connection attempts) will timeout after that many seconds - (if it is not given or ``None``, the global default timeout setting is used). + (if it is not given, the global default timeout setting is used). For example, the following calls all create instances that connect to the server at the same host and port:: Modified: python/trunk/Doc/library/poplib.rst ============================================================================== --- python/trunk/Doc/library/poplib.rst (original) +++ python/trunk/Doc/library/poplib.rst Thu May 29 18:39:26 2008 @@ -29,8 +29,8 @@ This class implements the actual POP3 protocol. The connection is created when the instance is initialized. If *port* is omitted, the standard POP3 port (110) is used. The optional *timeout* parameter specifies a timeout in seconds for the - connection attempt (if not specified, or passed as None, the global default - timeout setting will be used). + connection attempt (if not specified, the global default timeout setting will + be used). .. versionchanged:: 2.6 *timeout* was added. Modified: python/trunk/Doc/library/smtplib.rst ============================================================================== --- python/trunk/Doc/library/smtplib.rst (original) +++ python/trunk/Doc/library/smtplib.rst Thu May 29 18:39:26 2008 @@ -25,8 +25,8 @@ with those parameters during initialization. An :exc:`SMTPConnectError` is raised if the specified host doesn't respond correctly. The optional *timeout* parameter specifies a timeout in seconds for blocking operations - like the connection attempt (if not specified, or passed as None, the global - default timeout setting will be used). + like the connection attempt (if not specified, the global default timeout + setting will be used). For normal use, you should only require the initialization/connect, :meth:`sendmail`, and :meth:`quit` methods. An example is included below. @@ -45,8 +45,8 @@ and *certfile* are also optional, and can contain a PEM formatted private key and certificate chain file for the SSL connection. The optional *timeout* parameter specifies a timeout in seconds for blocking operations like the - connection attempt (if not specified, or passed as None, the global default - timeout setting will be used). + connection attempt (if not specified, the global default timeout setting + will be used). .. versionchanged:: 2.6 *timeout* was added. Modified: python/trunk/Doc/library/socket.rst ============================================================================== --- python/trunk/Doc/library/socket.rst (original) +++ python/trunk/Doc/library/socket.rst Thu May 29 18:39:26 2008 @@ -207,12 +207,11 @@ .. function:: create_connection(address[, timeout]) - Connects to the *address* received (as usual, a ``(host, port)`` pair), with an - optional timeout for the connection. Especially useful for higher-level - protocols, it is not normally used directly from application-level code. - Passing the optional *timeout* parameter will set the timeout on the socket - instance (if it is not given or ``None``, the global default timeout setting is - used). + Convenience function. Connect to *address* (a 2-tuple ``(host, port)``), + and return the socket object. Passing the optional *timeout* parameter will + set the timeout on the socket instance before attempting to connect. If no + *timeout* is supplied, the global default timeout setting returned by + :func:`getdefaulttimeout` is used. .. versionadded:: 2.6 Modified: python/trunk/Doc/library/telnetlib.rst ============================================================================== --- python/trunk/Doc/library/telnetlib.rst (original) +++ python/trunk/Doc/library/telnetlib.rst Thu May 29 18:39:26 2008 @@ -28,6 +28,11 @@ :class:`Telnet` represents a connection to a Telnet server. The instance is initially not connected by default; the :meth:`open` method must be used to establish a connection. Alternatively, the host name and optional port + and timeout can be passed to the constructor, in which case the connection to + the server will be established before the constructor returns. The optional + *timeout* parameter specifies a timeout in seconds for the connection attempt (if + not specified, the global default timeout setting will be used). + number can be passed to the constructor, to, in which case the connection to the server will be established before the constructor returns. The optional *timeout* parameter specifies a timeout in seconds for blocking operations @@ -128,8 +133,7 @@ Connect to a host. The optional second argument is the port number, which defaults to the standard Telnet port (23). The optional *timeout* parameter specifies a timeout in seconds for blocking operations like the connection - attempt (if not specified, or passed as None, the global default timeout - setting will be used). + attempt (if not specified, the global default timeout setting will be used). Do not try to reopen an already connected instance. Modified: python/trunk/Doc/library/urllib2.rst ============================================================================== --- python/trunk/Doc/library/urllib2.rst (original) +++ python/trunk/Doc/library/urllib2.rst Thu May 29 18:39:26 2008 @@ -27,9 +27,9 @@ returns a string in this format. The optional *timeout* parameter specifies a timeout in seconds for blocking - operations like the connection attempt (if not specified, or passed as - ``None``, the global default timeout setting will be used). This actually - only works for HTTP, HTTPS, FTP and FTPS connections. + operations like the connection attempt (if not specified, the global default + timeout setting will be used). This actually only works for HTTP, HTTPS, + FTP and FTPS connections. This function returns a file-like object with two additional methods: @@ -411,9 +411,9 @@ the same as those of :func:`urlopen` (which simply calls the :meth:`open` method on the currently installed global :class:`OpenerDirector`). The optional *timeout* parameter specifies a timeout in seconds for blocking - operations like the connection attempt (if not specified, or passed as - ``None``, the global default timeout setting will be used; this actually only - works for HTTP, HTTPS, FTP and FTPS connections). + operations like the connection attempt (if not specified, the global default + timeout setting will be usedi). The timeout feature actually works only for + HTTP, HTTPS, FTP and FTPS connections). .. versionchanged:: 2.6 *timeout* was added. Modified: python/trunk/Lib/ftplib.py ============================================================================== --- python/trunk/Lib/ftplib.py (original) +++ python/trunk/Lib/ftplib.py Thu May 29 18:39:26 2008 @@ -44,6 +44,7 @@ from socket import getfqdn; socket.getfqdn = getfqdn; del getfqdn except ImportError: import socket +from socket import _GLOBAL_DEFAULT_TIMEOUT __all__ = ["FTP","Netrc"] @@ -71,7 +72,6 @@ # Line terminators (we always output CRLF, but accept any of CRLF, CR, LF) CRLF = '\r\n' - # The class itself class FTP: @@ -109,14 +109,15 @@ # Initialize host to localhost, port to standard ftp port # Optional arguments are host (for connect()), # and user, passwd, acct (for login()) - def __init__(self, host='', user='', passwd='', acct='', timeout=None): + def __init__(self, host='', user='', passwd='', acct='', + timeout=_GLOBAL_DEFAULT_TIMEOUT): self.timeout = timeout if host: self.connect(host) if user: self.login(user, passwd, acct) - def connect(self, host='', port=0, timeout=None): + def connect(self, host='', port=0, timeout=-999): '''Connect to host. Arguments are: - host: hostname to connect to (string, default previous host) - port: port to connect to (integer, default previous port) @@ -125,7 +126,7 @@ self.host = host if port > 0: self.port = port - if timeout is not None: + if timeout != -999: self.timeout = timeout self.sock = socket.create_connection((self.host, self.port), self.timeout) self.af = self.sock.family Modified: python/trunk/Lib/httplib.py ============================================================================== --- python/trunk/Lib/httplib.py (original) +++ python/trunk/Lib/httplib.py Thu May 29 18:39:26 2008 @@ -639,7 +639,8 @@ debuglevel = 0 strict = 0 - def __init__(self, host, port=None, strict=None, timeout=None): + def __init__(self, host, port=None, strict=None, + timeout=socket._GLOBAL_DEFAULT_TIMEOUT): self.timeout = timeout self.sock = None self._buffer = [] @@ -1055,7 +1056,7 @@ default_port = HTTPS_PORT def __init__(self, host, port=None, key_file=None, cert_file=None, - strict=None, timeout=None): + strict=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT): HTTPConnection.__init__(self, host, port, strict, timeout) self.key_file = key_file self.cert_file = cert_file Modified: python/trunk/Lib/poplib.py ============================================================================== --- python/trunk/Lib/poplib.py (original) +++ python/trunk/Lib/poplib.py Thu May 29 18:39:26 2008 @@ -76,7 +76,8 @@ """ - def __init__(self, host, port=POP3_PORT, timeout=None): + def __init__(self, host, port=POP3_PORT, + timeout=socket._GLOBAL_DEFAULT_TIMEOUT): self.host = host self.port = port self.sock = socket.create_connection((host, port), timeout) Modified: python/trunk/Lib/smtplib.py ============================================================================== --- python/trunk/Lib/smtplib.py (original) +++ python/trunk/Lib/smtplib.py Thu May 29 18:39:26 2008 @@ -220,7 +220,8 @@ ehlo_resp = None does_esmtp = 0 - def __init__(self, host='', port=0, local_hostname=None, timeout=None): + def __init__(self, host='', port=0, local_hostname=None, + timeout=socket._GLOBAL_DEFAULT_TIMEOUT): """Initialize a new instance. If specified, `host' is the name of the remote host to which to @@ -741,7 +742,8 @@ certificate chain file for the SSL connection. """ def __init__(self, host='', port=0, local_hostname=None, - keyfile=None, certfile=None, timeout=None): + keyfile=None, certfile=None, + timeout=socket._GLOBAL_DEFAULT_TIMEOUT): self.keyfile = keyfile self.certfile = certfile SMTP.__init__(self, host, port, local_hostname, timeout) Modified: python/trunk/Lib/socket.py ============================================================================== --- python/trunk/Lib/socket.py (original) +++ python/trunk/Lib/socket.py Thu May 29 18:39:26 2008 @@ -480,14 +480,17 @@ raise StopIteration return line +_GLOBAL_DEFAULT_TIMEOUT = object() -def create_connection(address, timeout=None): - """Connect to address (host, port) with an optional timeout. +def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT): + """Connect to *address* and return the socket object. - Provides access to socketobject timeout for higher-level - protocols. Passing a timeout will set the timeout on the - socket instance (if not present, or passed as None, the - default global timeout setting will be used). + Convenience function. Connect to *address* (a 2-tuple ``(host, + port)``) and return the socket object. Passing the optional + *timeout* parameter will set the timeout on the socket instance + before attempting to connect. If no *timeout* is supplied, the + global default timeout setting returned by :func:`getdefaulttimeout` + is used. """ msg = "getaddrinfo returns an empty list" @@ -497,7 +500,7 @@ sock = None try: sock = socket(af, socktype, proto) - if timeout is not None: + if timeout is not _GLOBAL_DEFAULT_TIMEOUT: sock.settimeout(timeout) sock.connect(sa) return sock Modified: python/trunk/Lib/telnetlib.py ============================================================================== --- python/trunk/Lib/telnetlib.py (original) +++ python/trunk/Lib/telnetlib.py Thu May 29 18:39:26 2008 @@ -184,13 +184,13 @@ """ - def __init__(self, host=None, port=0, timeout=None): + def __init__(self, host=None, port=0, + timeout=socket._GLOBAL_DEFAULT_TIMEOUT): """Constructor. When called without arguments, create an unconnected instance. - With a hostname argument, it connects the instance; a port - number is optional. - + With a hostname argument, it connects the instance; port number + and timeout are optional. """ self.debuglevel = DEBUGLEVEL self.host = host @@ -208,23 +208,21 @@ if host is not None: self.open(host, port, timeout) - def open(self, host, port=0, timeout=None): + def open(self, host, port=0, timeout=socket._GLOBAL_DEFAULT_TIMEOUT): """Connect to a host. The optional second argument is the port number, which defaults to the standard telnet port (23). Don't try to reopen an already connected instance. - """ self.eof = 0 if not port: port = TELNET_PORT self.host = host self.port = port - if timeout is not None: - self.timeout = timeout - self.sock = socket.create_connection((host, port), self.timeout) + self.timeout = timeout + self.sock = socket.create_connection((host, port), timeout) def __del__(self): """Destructor -- close the connection.""" Modified: python/trunk/Lib/test/test_ftplib.py ============================================================================== --- python/trunk/Lib/test/test_ftplib.py (original) +++ python/trunk/Lib/test/test_ftplib.py Thu May 29 18:39:26 2008 @@ -53,35 +53,52 @@ # connects ftp = ftplib.FTP(HOST) self.evt.wait() - ftp.sock.close() + ftp.close() def testTimeoutDefault(self): - # default - ftp = ftplib.FTP(HOST) + # default -- use global socket timeout + self.assert_(socket.getdefaulttimeout() is None) + socket.setdefaulttimeout(30) + try: + ftp = ftplib.FTP("localhost") + finally: + socket.setdefaulttimeout(None) + self.assertEqual(ftp.sock.gettimeout(), 30) + self.evt.wait() + ftp.close() + + def testTimeoutNone(self): + # no timeout -- do not use global socket timeout + self.assert_(socket.getdefaulttimeout() is None) + socket.setdefaulttimeout(30) + try: + ftp = ftplib.FTP("localhost", timeout=None) + finally: + socket.setdefaulttimeout(None) self.assertTrue(ftp.sock.gettimeout() is None) self.evt.wait() - ftp.sock.close() + ftp.close() def testTimeoutValue(self): # a value ftp = ftplib.FTP(HOST, timeout=30) self.assertEqual(ftp.sock.gettimeout(), 30) self.evt.wait() - ftp.sock.close() + ftp.close() def testTimeoutConnect(self): ftp = ftplib.FTP() ftp.connect(HOST, timeout=30) self.assertEqual(ftp.sock.gettimeout(), 30) self.evt.wait() - ftp.sock.close() + ftp.close() def testTimeoutDifferentOrder(self): ftp = ftplib.FTP(timeout=30) ftp.connect(HOST) self.assertEqual(ftp.sock.gettimeout(), 30) self.evt.wait() - ftp.sock.close() + ftp.close() def testTimeoutDirectAccess(self): ftp = ftplib.FTP() @@ -89,18 +106,6 @@ ftp.connect(HOST) self.assertEqual(ftp.sock.gettimeout(), 30) self.evt.wait() - ftp.sock.close() - - def testTimeoutNone(self): - # None, having other default - previous = socket.getdefaulttimeout() - socket.setdefaulttimeout(30) - try: - ftp = ftplib.FTP(HOST, timeout=None) - finally: - socket.setdefaulttimeout(previous) - self.assertEqual(ftp.sock.gettimeout(), 30) - self.evt.wait() ftp.close() Modified: python/trunk/Lib/test/test_httplib.py ============================================================================== --- python/trunk/Lib/test/test_httplib.py (original) +++ python/trunk/Lib/test/test_httplib.py Thu May 29 18:39:26 2008 @@ -214,27 +214,32 @@ '''This will prove that the timeout gets through HTTPConnection and into the socket. ''' - # default - httpConn = httplib.HTTPConnection(HOST, TimeoutTest.PORT) - httpConn.connect() - self.assertTrue(httpConn.sock.gettimeout() is None) - httpConn.close() - - # a value - httpConn = httplib.HTTPConnection(HOST, TimeoutTest.PORT, timeout=30) - httpConn.connect() + # default -- use global socket timeout + self.assert_(socket.getdefaulttimeout() is None) + socket.setdefaulttimeout(30) + try: + httpConn = httplib.HTTPConnection(HOST, TimeoutTest.PORT) + httpConn.connect() + finally: + socket.setdefaulttimeout(None) self.assertEqual(httpConn.sock.gettimeout(), 30) httpConn.close() - # None, having other default - previous = socket.getdefaulttimeout() + # no timeout -- do not use global socket default + self.assert_(socket.getdefaulttimeout() is None) socket.setdefaulttimeout(30) try: httpConn = httplib.HTTPConnection(HOST, TimeoutTest.PORT, timeout=None) httpConn.connect() finally: - socket.setdefaulttimeout(previous) + socket.setdefaulttimeout(None) + self.assertEqual(httpConn.sock.gettimeout(), None) + httpConn.close() + + # a value + httpConn = httplib.HTTPConnection(HOST, TimeoutTest.PORT, timeout=30) + httpConn.connect() self.assertEqual(httpConn.sock.gettimeout(), 30) httpConn.close() Modified: python/trunk/Lib/test/test_poplib.py ============================================================================== --- python/trunk/Lib/test/test_poplib.py (original) +++ python/trunk/Lib/test/test_poplib.py Thu May 29 18:39:26 2008 @@ -40,28 +40,29 @@ pop.sock.close() def testTimeoutDefault(self): - # default - pop = poplib.POP3(HOST, self.port) - self.assertTrue(pop.sock.gettimeout() is None) - pop.sock.close() - - def testTimeoutValue(self): - # a value - pop = poplib.POP3(HOST, self.port, timeout=30) + self.assertTrue(socket.getdefaulttimeout() is None) + socket.setdefaulttimeout(30) + try: + pop = poplib.POP3("localhost", self.port) + finally: + socket.setdefaulttimeout(None) self.assertEqual(pop.sock.gettimeout(), 30) pop.sock.close() def testTimeoutNone(self): - # None, having other default - previous = socket.getdefaulttimeout() + self.assertTrue(socket.getdefaulttimeout() is None) socket.setdefaulttimeout(30) try: pop = poplib.POP3(HOST, self.port, timeout=None) finally: - socket.setdefaulttimeout(previous) - self.assertEqual(pop.sock.gettimeout(), 30) + socket.setdefaulttimeout(None) + self.assertTrue(pop.sock.gettimeout() is None) pop.sock.close() + def testTimeoutValue(self): + pop = poplib.POP3("localhost", self.port, timeout=30) + self.assertEqual(pop.sock.gettimeout(), 30) + pop.sock.close() def test_main(verbose=None): Modified: python/trunk/Lib/test/test_smtplib.py ============================================================================== --- python/trunk/Lib/test/test_smtplib.py (original) +++ python/trunk/Lib/test/test_smtplib.py Thu May 29 18:39:26 2008 @@ -54,41 +54,43 @@ def testBasic1(self): # connects smtp = smtplib.SMTP(HOST, self.port) - smtp.sock.close() + smtp.close() def testBasic2(self): # connects, include port in host name smtp = smtplib.SMTP("%s:%s" % (HOST, self.port)) - smtp.sock.close() + smtp.close() def testLocalHostName(self): # check that supplied local_hostname is used smtp = smtplib.SMTP(HOST, self.port, local_hostname="testhost") self.assertEqual(smtp.local_hostname, "testhost") - smtp.sock.close() + smtp.close() def testTimeoutDefault(self): - # default - smtp = smtplib.SMTP(HOST, self.port) - self.assertTrue(smtp.sock.gettimeout() is None) - smtp.sock.close() - - def testTimeoutValue(self): - # a value - smtp = smtplib.SMTP(HOST, self.port, timeout=30) + self.assertTrue(socket.getdefaulttimeout() is None) + socket.setdefaulttimeout(30) + try: + smtp = smtplib.SMTP(HOST, self.port) + finally: + socket.setdefaulttimeout(None) self.assertEqual(smtp.sock.gettimeout(), 30) - smtp.sock.close() + smtp.close() def testTimeoutNone(self): - # None, having other default - previous = socket.getdefaulttimeout() + self.assertTrue(socket.getdefaulttimeout() is None) socket.setdefaulttimeout(30) try: smtp = smtplib.SMTP(HOST, self.port, timeout=None) finally: - socket.setdefaulttimeout(previous) + socket.setdefaulttimeout(None) + self.assertTrue(smtp.sock.gettimeout() is None) + smtp.close() + + def testTimeoutValue(self): + smtp = smtplib.SMTP(HOST, self.port, timeout=30) self.assertEqual(smtp.sock.gettimeout(), 30) - smtp.sock.close() + smtp.close() # Test server thread using the specified SMTP server class Modified: python/trunk/Lib/test/test_socket.py ============================================================================== --- python/trunk/Lib/test/test_socket.py (original) +++ python/trunk/Lib/test/test_socket.py Thu May 29 18:39:26 2008 @@ -901,8 +901,25 @@ testTimeoutDefault = _justAccept def _testTimeoutDefault(self): - self.cli = socket.create_connection((HOST, self.port)) - self.assertTrue(self.cli.gettimeout() is None) + # passing no explicit timeout uses socket's global default + self.assert_(socket.getdefaulttimeout() is None) + socket.setdefaulttimeout(42) + try: + self.cli = socket.create_connection((HOST, self.port)) + finally: + socket.setdefaulttimeout(None) + self.assertEquals(self.cli.gettimeout(), 42) + + testTimeoutNone = _justAccept + def _testTimeoutNone(self): + # None timeout means the same as sock.settimeout(None) + self.assert_(socket.getdefaulttimeout() is None) + socket.setdefaulttimeout(30) + try: + self.cli = socket.create_connection((HOST, self.port), timeout=None) + finally: + socket.setdefaulttimeout(None) + self.assertEqual(self.cli.gettimeout(), None) testTimeoutValueNamed = _justAccept def _testTimeoutValueNamed(self): @@ -914,17 +931,6 @@ self.cli = socket.create_connection((HOST, self.port), 30) self.assertEqual(self.cli.gettimeout(), 30) - testTimeoutNone = _justAccept - def _testTimeoutNone(self): - previous = socket.getdefaulttimeout() - socket.setdefaulttimeout(30) - try: - self.cli = socket.create_connection((HOST, self.port), timeout=None) - finally: - socket.setdefaulttimeout(previous) - self.assertEqual(self.cli.gettimeout(), 30) - - class NetworkConnectionBehaviourTest(SocketTCPTest, ThreadableTest): def __init__(self, methodName='runTest'): Modified: python/trunk/Lib/test/test_telnetlib.py ============================================================================== --- python/trunk/Lib/test/test_telnetlib.py (original) +++ python/trunk/Lib/test/test_telnetlib.py Thu May 29 18:39:26 2008 @@ -40,34 +40,36 @@ telnet.sock.close() def testTimeoutDefault(self): - # default - telnet = telnetlib.Telnet(HOST, self.port) - self.assertTrue(telnet.sock.gettimeout() is None) - telnet.sock.close() - - def testTimeoutValue(self): - # a value - telnet = telnetlib.Telnet(HOST, self.port, timeout=30) - self.assertEqual(telnet.sock.gettimeout(), 30) - telnet.sock.close() - - def testTimeoutDifferentOrder(self): - telnet = telnetlib.Telnet(timeout=30) - telnet.open(HOST, self.port) + self.assertTrue(socket.getdefaulttimeout() is None) + socket.setdefaulttimeout(30) + try: + telnet = telnetlib.Telnet("localhost", self.port) + finally: + socket.setdefaulttimeout(None) self.assertEqual(telnet.sock.gettimeout(), 30) telnet.sock.close() def testTimeoutNone(self): # None, having other default - previous = socket.getdefaulttimeout() + self.assertTrue(socket.getdefaulttimeout() is None) socket.setdefaulttimeout(30) try: telnet = telnetlib.Telnet(HOST, self.port, timeout=None) finally: - socket.setdefaulttimeout(previous) + socket.setdefaulttimeout(None) + self.assertTrue(telnet.sock.gettimeout() is None) + telnet.sock.close() + + def testTimeoutValue(self): + telnet = telnetlib.Telnet("localhost", self.port, timeout=30) self.assertEqual(telnet.sock.gettimeout(), 30) telnet.sock.close() + def testTimeoutOpen(self): + telnet = telnetlib.Telnet() + telnet.open("localhost", self.port, timeout=30) + self.assertEqual(telnet.sock.gettimeout(), 30) + telnet.sock.close() def test_main(verbose=None): Modified: python/trunk/Lib/test/test_urllib.py ============================================================================== --- python/trunk/Lib/test/test_urllib.py (original) +++ python/trunk/Lib/test/test_urllib.py Thu May 29 18:39:26 2008 @@ -568,6 +568,7 @@ # . Facundo # # def server(evt): +# import socket, time # serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM) # serv.settimeout(3) # serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) @@ -592,6 +593,7 @@ # class FTPWrapperTests(unittest.TestCase): # # def setUp(self): +# import ftplib, time, threading # ftplib.FTP.port = 9093 # self.evt = threading.Event() # threading.Thread(target=server, args=(self.evt,)).start() @@ -603,31 +605,37 @@ # def testBasic(self): # # connects # ftp = urllib.ftpwrapper("myuser", "mypass", "localhost", 9093, []) -# ftp.ftp.sock.close() +# ftp.close() # -# def testTimeoutDefault(self): -# # default -# ftp = urllib.ftpwrapper("myuser", "mypass", "localhost", 9093, []) -# self.assertTrue(ftp.ftp.sock.gettimeout() is None) -# ftp.ftp.sock.close() -# -# def testTimeoutValue(self): -# # a value -# ftp = urllib.ftpwrapper("myuser", "mypass", "localhost", 9093, [], timeout=30) +# def testTimeoutNone(self): +# # global default timeout is ignored +# import socket +# self.assert_(socket.getdefaulttimeout() is None) +# socket.setdefaulttimeout(30) +# try: +# ftp = urllib.ftpwrapper("myuser", "mypass", "localhost", 9093, []) +# finally: +# socket.setdefaulttimeout(None) # self.assertEqual(ftp.ftp.sock.gettimeout(), 30) -# ftp.ftp.sock.close() +# ftp.close() # -# def testTimeoutNone(self): -# # None, having other default -# previous = socket.getdefaulttimeout() +# def testTimeoutDefault(self): +# # global default timeout is used +# import socket +# self.assert_(socket.getdefaulttimeout() is None) # socket.setdefaulttimeout(30) # try: # ftp = urllib.ftpwrapper("myuser", "mypass", "localhost", 9093, []) # finally: -# socket.setdefaulttimeout(previous) +# socket.setdefaulttimeout(None) # self.assertEqual(ftp.ftp.sock.gettimeout(), 30) -# ftp.ftp.close() +# ftp.close() # +# def testTimeoutValue(self): +# ftp = urllib.ftpwrapper("myuser", "mypass", "localhost", 9093, [], +# timeout=30) +# self.assertEqual(ftp.ftp.sock.gettimeout(), 30) +# ftp.close() Modified: python/trunk/Lib/test/test_urllib2.py ============================================================================== --- python/trunk/Lib/test/test_urllib2.py (original) +++ python/trunk/Lib/test/test_urllib2.py Thu May 29 18:39:26 2008 @@ -2,6 +2,7 @@ from test import test_support import os +import socket import StringIO import urllib2 @@ -551,14 +552,15 @@ class NullFTPHandler(urllib2.FTPHandler): def __init__(self, data): self.data = data - def connect_ftp(self, user, passwd, host, port, dirs, timeout=None): + def connect_ftp(self, user, passwd, host, port, dirs, + timeout=socket._GLOBAL_DEFAULT_TIMEOUT): self.user, self.passwd = user, passwd self.host, self.port = host, port self.dirs = dirs self.ftpwrapper = MockFTPWrapper(self.data) return self.ftpwrapper - import ftplib, socket + import ftplib data = "rheum rhaponicum" h = NullFTPHandler(data) o = h.parent = MockOpener() @@ -691,7 +693,7 @@ self.req_headers = [] self.data = None self.raise_on_endheaders = False - def __call__(self, host, timeout=None): + def __call__(self, host, timeout=socket._GLOBAL_DEFAULT_TIMEOUT): self.host = host self.timeout = timeout return self Modified: python/trunk/Lib/test/test_urllib2net.py ============================================================================== --- python/trunk/Lib/test/test_urllib2net.py (original) +++ python/trunk/Lib/test/test_urllib2net.py Thu May 29 18:39:26 2008 @@ -189,46 +189,58 @@ class TimeoutTest(unittest.TestCase): def test_http_basic(self): + self.assertTrue(socket.getdefaulttimeout() is None) u = _urlopen_with_retry("http://www.python.org") self.assertTrue(u.fp._sock.fp._sock.gettimeout() is None) - def test_http_NoneWithdefault(self): - prev = socket.getdefaulttimeout() + def test_http_default_timeout(self): + self.assertTrue(socket.getdefaulttimeout() is None) + socket.setdefaulttimeout(60) + try: + u = _urlopen_with_retry("http://www.python.org") + finally: + socket.setdefaulttimeout(None) + self.assertEqual(u.fp._sock.fp._sock.gettimeout(), 60) + + def test_http_no_timeout(self): + self.assertTrue(socket.getdefaulttimeout() is None) socket.setdefaulttimeout(60) try: u = _urlopen_with_retry("http://www.python.org", timeout=None) - self.assertEqual(u.fp._sock.fp._sock.gettimeout(), 60) finally: - socket.setdefaulttimeout(prev) + socket.setdefaulttimeout(None) + self.assertTrue(u.fp._sock.fp._sock.gettimeout() is None) - def test_http_Value(self): + def test_http_timeout(self): u = _urlopen_with_retry("http://www.python.org", timeout=120) self.assertEqual(u.fp._sock.fp._sock.gettimeout(), 120) - def test_http_NoneNodefault(self): - u = _urlopen_with_retry("http://www.python.org", timeout=None) - self.assertTrue(u.fp._sock.fp._sock.gettimeout() is None) - FTP_HOST = "ftp://ftp.mirror.nl/pub/mirror/gnu/" def test_ftp_basic(self): + self.assertTrue(socket.getdefaulttimeout() is None) u = _urlopen_with_retry(self.FTP_HOST) self.assertTrue(u.fp.fp._sock.gettimeout() is None) - def test_ftp_NoneWithdefault(self): - prev = socket.getdefaulttimeout() + def test_ftp_default_timeout(self): + self.assertTrue(socket.getdefaulttimeout() is None) socket.setdefaulttimeout(60) try: - u = _urlopen_with_retry(self.FTP_HOST, timeout=None) - self.assertEqual(u.fp.fp._sock.gettimeout(), 60) + u = _urlopen_with_retry(self.FTP_HOST) finally: - socket.setdefaulttimeout(prev) + socket.setdefaulttimeout(None) + self.assertEqual(u.fp.fp._sock.gettimeout(), 60) - def test_ftp_NoneNodefault(self): - u = _urlopen_with_retry(self.FTP_HOST, timeout=None) + def test_ftp_no_timeout(self): + self.assertTrue(socket.getdefaulttimeout() is None) + socket.setdefaulttimeout(60) + try: + u = _urlopen_with_retry(self.FTP_HOST, timeout=None) + finally: + socket.setdefaulttimeout(None) self.assertTrue(u.fp.fp._sock.gettimeout() is None) - def test_ftp_Value(self): + def test_ftp_timeout(self): u = _urlopen_with_retry(self.FTP_HOST, timeout=60) self.assertEqual(u.fp.fp._sock.gettimeout(), 60) Modified: python/trunk/Lib/urllib.py ============================================================================== --- python/trunk/Lib/urllib.py (original) +++ python/trunk/Lib/urllib.py Thu May 29 18:39:26 2008 @@ -832,7 +832,8 @@ class ftpwrapper: """Class used by open_ftp() for cache of open FTP connections.""" - def __init__(self, user, passwd, host, port, dirs, timeout=None): + def __init__(self, user, passwd, host, port, dirs, + timeout=socket._GLOBAL_DEFAULT_TIMEOUT): self.user = user self.passwd = passwd self.host = host Modified: python/trunk/Lib/urllib2.py ============================================================================== --- python/trunk/Lib/urllib2.py (original) +++ python/trunk/Lib/urllib2.py Thu May 29 18:39:26 2008 @@ -117,7 +117,7 @@ __version__ = sys.version[:3] _opener = None -def urlopen(url, data=None, timeout=None): +def urlopen(url, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT): global _opener if _opener is None: _opener = build_opener() @@ -359,7 +359,7 @@ if result is not None: return result - def open(self, fullurl, data=None, timeout=None): + def open(self, fullurl, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT): # accept a URL or a Request object if isinstance(fullurl, basestring): req = Request(fullurl, data)

1 0