diff -r 6982f460fa6d Doc/library/urllib.request.rst
--- a/Doc/library/urllib.request.rst	Mon Mar 26 23:35:31 2012 -0400
+++ b/Doc/library/urllib.request.rst	Tue Mar 27 19:57:02 2012 +0200
@@ -551,7 +551,7 @@
 post-process *protocol* responses.
 
 
-.. method:: OpenerDirector.open(url, data=None[, timeout])
+.. method:: OpenerDirector.open(url, data=None, timeout=None)
 
 Open the given *url* (which can be a request object or a string), optionally
 passing the given *data*. Arguments, return values and exceptions raised are
diff -r 6982f460fa6d Lib/urllib/request.py
--- a/Lib/urllib/request.py	Mon Mar 26 23:35:31 2012 -0400
+++ b/Lib/urllib/request.py	Tue Mar 27 19:57:02 2012 +0200
@@ -449,7 +449,9 @@
 if result is not None:
 return result
 
- def open(self, fullurl, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT):
+ def open(self, fullurl, data=None, timeout=None):
+ if timeout is None:
+ timeout = socket._GLOBAL_DEFAULT_TIMEOUT
 # accept a URL or a Request object
 if isinstance(fullurl, str):
 req = Request(fullurl, data)
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://bugs.python.org/file25045/OpenDirector.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://bugs.python.org/file25045/OpenDirector.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>