[Python-checkins] cpython (merge 3.2 -> default): Merge from 3.2 - Issue9637 - Explain in getproxies_environment that

Tue Jan 10 18:30:40 CET 2012

http://hg.python.org/cpython/rev/eb028b3c62c9
changeset: 74323:eb028b3c62c9
parent: 74317:4f8c24830a5c
parent: 74322:3370fa13ed73
user: Senthil Kumaran <senthil at uthcode.com>
date: Wed Jan 11 01:30:23 2012 +0800
summary:
 Merge from 3.2 - Issue9637 - Explain in getproxies_environment that <scheme>_proxy environ variable case does not matter.
files:
 Doc/library/urllib.request.rst | 8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -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:
-- 
Repository URL: http://hg.python.org/cpython
