summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2016-04-23 03:35:40 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2016-04-23 03:35:40 (GMT)
commit3973d277020a740787c40083eb101b2d0ec0eda3 (patch)
tree3f103db5fea0ef38e2a128e6f794a622202d39ca
parentda28494d0a208410f5f7c1df476da9268908c565 (diff)
parent21ce717eafca96b60fb1c6a791332a41e6777783 (diff)
downloadcpython-3973d277020a740787c40083eb101b2d0ec0eda3.zip
cpython-3973d277020a740787c40083eb101b2d0ec0eda3.tar.gz
cpython-3973d277020a740787c40083eb101b2d0ec0eda3.tar.bz2
merge 3.5
Document no_proxy environment variable in python 3.x #issue23806
-rw-r--r--Doc/library/urllib.request.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index fc9b38f..5a47201 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -269,6 +269,11 @@ The following classes are provided:
To disable autodetected proxy pass an empty dictionary.
+ 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``.
+
.. class:: HTTPPasswordMgr()