merge 3.5

orsenthil · orsenthil · commit 3973d277020a · 2016-04-22T20:35:40.000-07:00
Document no_proxy environment variable in python 3.x #issue23806
diff --git 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()
 
