cpython: eb028b3c62c9 (original) (raw)
Mercurial > cpython
changeset 74323:eb028b3c62c9
Merge from 3.2 - Issue9637 - Explain in getproxies_environment that _proxy environ variable case does not matter.
| Senthil Kumaran senthil@uthcode.com | |
|---|---|
| date | Wed, 11 Jan 2012 01:30:23 +0800 |
| parents | 4f8c24830a5c(current diff)3370fa13ed73(diff) |
| children | 6d395ed03f95 |
| files | Doc/library/urllib.request.rst |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-)[+] [-] Doc/library/urllib.request.rst 8 |
line wrap: on
line diff
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -124,10 +124,10 @@ The :mod:urllib.request module defines
.. 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.