Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
129fa64e
Commit
129fa64e
authored
Apr 28, 2013
by
R David Murray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reflow paragraphs.
I know one of them looks worse, but now it is <80 chars and matches the 2.7 text.
parent
396f78ec
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
14 deletions
+13
-14
Doc/howto/urllib2.rst
Doc/howto/urllib2.rst
+4
-4
Doc/library/urllib.request.rst
Doc/library/urllib.request.rst
+9
-10
No files found.
Doc/howto/urllib2.rst
View file @
129fa64e
...
@@ -523,10 +523,10 @@ Proxies
...
@@ -523,10 +523,10 @@ Proxies
**urllib** will auto-detect your proxy settings and use those. This is through
**urllib** will auto-detect your proxy settings and use those. This is through
the ``ProxyHandler``, which is part of the normal handler chain when a proxy
the ``ProxyHandler``, which is part of the normal handler chain when a proxy
setting is detected. Normally that's
setting is detected. Normally that's
a good thing, but there are occasions
a good thing, but there are occasions when it may not be helpful [#]_. One way
when it may not be helpful [#]_. One way to do this is to setup our own
to do this is to setup our own ``ProxyHandler``, with no proxies defined. This
``ProxyHandler``, with no proxies defined. This is done using similar steps to
is done using similar steps to
setting up a `Basic Authentication`_ handler : ::
setting up a `Basic Authentication`_ handler : ::
>>> proxy_support = urllib.request.ProxyHandler({})
>>> proxy_support = urllib.request.ProxyHandler({})
>>> opener = urllib.request.build_opener(proxy_support)
>>> opener = urllib.request.build_opener(proxy_support)
...
...
Doc/library/urllib.request.rst
View file @
129fa64e
...
@@ -129,10 +129,9 @@ The :mod:`urllib.request` module defines the following functions:
...
@@ -129,10 +129,9 @@ The :mod:`urllib.request` module defines the following functions:
the constructor without any parameters). Instances of the following classes
the constructor without any parameters). Instances of the following classes
will be in front of the *handler*\s, unless the *handler*\s contain them,
will be in front of the *handler*\s, unless the *handler*\s contain them,
instances of them or subclasses of them: :class:`ProxyHandler` (if proxy
instances of them or subclasses of them: :class:`ProxyHandler` (if proxy
settings are detected),
settings are detected), :class:`UnknownHandler`, :class:`HTTPHandler`,
:class:`UnknownHandler`, :class:`HTTPHandler`, :class:`HTTPDefaultErrorHandler`,
:class:`HTTPDefaultErrorHandler`, :class:`HTTPRedirectHandler`,
:class:`HTTPRedirectHandler`, :class:`FTPHandler`, :class:`FileHandler`,
:class:`FTPHandler`, :class:`FileHandler`, :class:`HTTPErrorProcessor`.
:class:`HTTPErrorProcessor`.
If the Python installation has SSL support (i.e., if the :mod:`ssl` module
If the Python installation has SSL support (i.e., if the :mod:`ssl` module
can be imported), :class:`HTTPSHandler` will also be added.
can be imported), :class:`HTTPSHandler` will also be added.
...
@@ -257,12 +256,12 @@ The following classes are provided:
...
@@ -257,12 +256,12 @@ The following classes are provided:
.. class:: ProxyHandler(proxies=None)
.. class:: ProxyHandler(proxies=None)
Cause requests to go through a proxy. If *proxies* is given, it must be a
Cause requests to go through a proxy. If *proxies* is given, it must be a
dictionary mapping protocol names to URLs of proxies. The default is to read
the
dictionary mapping protocol names to URLs of proxies. The default is to read
list of proxies from the environment variables :envvar:`
<protocol>
_proxy`.
the list of proxies from the environment variables
If no proxy environment variables are set, then in a Windows environment proxy
:envvar:`
<protocol>
_proxy`. If no proxy environment variables are set, then
settings are obtained from the registry's Internet Settings section, and in a
in a Windows environment proxy settings are obtained from the registry's
Mac OS X environment proxy information is retrieved from the OS X System
Internet Settings section, and in a Mac OS X environment proxy information
Configuration Framework.
is retrieved from the OS X System
Configuration Framework.
To disable autodetected proxy pass an empty dictionary.
To disable autodetected proxy pass an empty dictionary.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment