summaryrefslogtreecommitdiffstats
path: root/Doc/howto
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2016-07-31 06:48:19 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2016-07-31 06:48:19 (GMT)
commit7bfbd1d3c56b2a5281edeb7a8e21598618b7c1a3 (patch)
treeeb60c18adf0f714205c773f832ff487572e9bed0 /Doc/howto
parentdbaa559b7fc6b80c1f230119f609b99b5b3844f3 (diff)
parent17742f2d45c9dd7ca777e33601a26e80576fdbf6 (diff)
downloadcpython-7bfbd1d3c56b2a5281edeb7a8e21598618b7c1a3.zip
cpython-7bfbd1d3c56b2a5281edeb7a8e21598618b7c1a3.tar.gz
cpython-7bfbd1d3c56b2a5281edeb7a8e21598618b7c1a3.tar.bz2
merge heads
Diffstat (limited to 'Doc/howto')
-rw-r--r--Doc/howto/urllib2.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst
index 24a4156..d2c7991 100644
--- a/Doc/howto/urllib2.rst
+++ b/Doc/howto/urllib2.rst
@@ -538,6 +538,11 @@ setting up a `Basic Authentication`_ handler: ::
through a proxy. However, this can be enabled by extending urllib.request as
shown in the recipe [#]_.
+.. note::
+
+ ``HTTP_PROXY`` will be ignored if a variable ``REQUEST_METHOD`` is set; see
+ the documentation on :func:`~urllib.request.getproxies`.
+
Sockets and Layers
==================