[Python-checkins] cpython (merge 3.5 -> default): merge 3.5

[senthil.kumaran]

https://hg.python.org/cpython/rev/103fb8be940b
changeset:   101094:103fb8be940b
parent:      101091:c36b9ef8ff39
parent:      101093:5424a559ddea
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Fri Apr 22 20:35:40 2016 -0700
summary:
  merge 3.5

Document no_proxy environment variable in python 3.x #issue23806

files:
  Doc/library/urllib.request.rst |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -269,6 +269,11 @@
 
    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()
 

-- 
Repository URL: https://hg.python.org/cpython