changeset: 74323:eb028b3c62c9
parent: 74317:4f8c24830a5c
parent: 74322:3370fa13ed73
user: Senthil Kumaran <senthil@uthcode.com>
date: Wed Jan 11 01:30:23 2012 +0800
files: Doc/library/urllib.request.rst
description:
Merge from 3.2 - Issue9637 - Explain in getproxies_environment that <scheme>_proxy environ variable case does not matter.
diff -r 4f8c24830a5c -r eb028b3c62c9 Doc/library/urllib.request.rst
--- a/Doc/library/urllib.request.rst	Mon Jan 09 18:33:27 2012 -0500
+++ b/Doc/library/urllib.request.rst	Wed Jan 11 01:30:23 2012 +0800
@@ -124,10 +124,10 @@
 .. function:: getproxies()
 
 This helper function returns a dictionary of scheme to proxy server URL
- mappings. It scans the environment for variables named ``<scheme>_proxy``
- for all operating systems first, and when it cannot find it, looks for proxy
- information from Mac OSX System Configuration for Mac OS X and Windows
- Systems Registry for Windows.
+ mappings. It scans the environment for variables named ``<scheme>_proxy``,
+ in a case insensitive approach, for all operating systems first, and when it
+ cannot find it, looks for proxy information from Mac OSX System
+ Configuration for Mac OS X and Windows Systems Registry for Windows.
 
 
 The following classes are provided:
</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://hg.python.org/cpython/rev/eb028b3c62c9">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/eb028b3c62c9" 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>