Added an optional timeout parameter to function urllib2.urlopen,
with tests in test_urllib2net.py (must have network resource
enabled to execute them). Also modified test_urllib2.py because
testing mock classes must take it into acount. Docs are also
updated.
diff --git a/Misc/NEWS b/Misc/NEWS
index a627765..b786745 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -222,6 +222,9 @@
Library
-------
+- The urlopen function of urllib2 now has an optional timeout parameter (note
+ that it actually works with HTTP, HTTPS, FTP and FTPS connections).
+
- In ftplib, the FTP.ntransfercmd method, when in passive mode, now uses
the socket.create_connection function, using the timeout specified at
connection time.