summaryrefslogtreecommitdiffstats
path: root/Doc/library/urllib.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-01-20 12:05:43 (GMT)
committerGeorg Brandl <georg@python.org>2008-01-20 12:05:43 (GMT)
commit2235011d49bc543ced855804ac9b87c0e98a7b19 (patch)
tree0996fd7241340d0b726e9b0f790b4f65b702e394 /Doc/library/urllib.rst
parent9b0d46db115c10767b240a0a64286214b50fe6ad (diff)
downloadcpython-2235011d49bc543ced855804ac9b87c0e98a7b19.zip
cpython-2235011d49bc543ced855804ac9b87c0e98a7b19.tar.gz
cpython-2235011d49bc543ced855804ac9b87c0e98a7b19.tar.bz2
#856047: respect the ``no_proxy`` env var when checking for proxies
in urllib and using the other ``_proxy`` env vars. Original patch by Donovan Baarda.
Diffstat (limited to 'Doc/library/urllib.rst')
-rw-r--r--Doc/library/urllib.rst9
1 files changed, 9 insertions, 0 deletions
diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst
index 3ec6e88..2718d80 100644
--- a/Doc/library/urllib.rst
+++ b/Doc/library/urllib.rst
@@ -79,6 +79,11 @@ High-level interface
% python
...
+ The :envvar:`no_proxy` environment variable can be used to specify hosts which
+ shouldn't be reached via proxy; if set, it should be a comma-separated list
+ of hostname suffixes, optionally with ``:port`` appended, for example
+ ``cern.ch,ncsa.uiuc.edu,some.host:8080``.
+
In a Windows environment, if no proxy environment variables are set, proxy
settings are obtained from the registry's Internet Settings section.
@@ -112,6 +117,10 @@ High-level interface
.. versionchanged:: 2.3
Added the *proxies* support.
+ .. versionchanged:: 2.6
+ Added :meth:`getcode` to returned object and support for the
+ :envvar:`no_proxy` environment variable.
+
.. function:: urlretrieve(url[, filename[, reporthook[, data]]])