summaryrefslogtreecommitdiffstats
path: root/Doc/library/urllib.request.rst
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-01-10 17:30:23 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2012-01-10 17:30:23 (GMT)
commitbda7a80194849eb2797c8bbffdbbaccad36d4583 (patch)
treec139d7510b91e861331c012afa958778248963be /Doc/library/urllib.request.rst
parent8d172343ad4d6b79ed076b294dfe963ebdab7c84 (diff)
parent19d85c2762feae1765de6e2e509b5744a0d60293 (diff)
downloadcpython-bda7a80194849eb2797c8bbffdbbaccad36d4583.zip
cpython-bda7a80194849eb2797c8bbffdbbaccad36d4583.tar.gz
cpython-bda7a80194849eb2797c8bbffdbbaccad36d4583.tar.bz2
Merge from 3.2 - Issue9637 - Explain in getproxies_environment that <scheme>_proxy environ variable case does not matter.
Diffstat (limited to 'Doc/library/urllib.request.rst')
-rw-r--r--Doc/library/urllib.request.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index abd9f35..29a8413 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -124,10 +124,10 @@ The :mod:`urllib.request` module defines the following functions:
.. 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: