[Python-checkins] cpython (merge 3.5 -> 3.6): Issues #29189: Merge indentation fixes from 3.5
martin.panter
python-checkins at python.org
Tue Jan 24 01:30:02 EST 2017
https://hg.python.org/cpython/rev/f0854405c830
changeset: 106294:f0854405c830
branch: 3.6
parent: 106290:146f7ec82f93
parent: 106293:75e341d79c99
user: Martin Panter <vadmium+py at gmail.com>
date: Tue Jan 24 00:29:11 2017 +0000
summary:
Issues #29189: Merge indentation fixes from 3.5
files:
Doc/library/json.rst | 22 +++---
Doc/library/urllib.request.rst | 78 +++++++++++-----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -505,27 +505,27 @@
.. exception:: JSONDecodeError(msg, doc, pos, end=None)
- Subclass of :exc:`ValueError` with the following additional attributes:
+ Subclass of :exc:`ValueError` with the following additional attributes:
- .. attribute:: msg
+ .. attribute:: msg
- The unformatted error message.
+ The unformatted error message.
- .. attribute:: doc
+ .. attribute:: doc
- The JSON document being parsed.
+ The JSON document being parsed.
- .. attribute:: pos
+ .. attribute:: pos
- The start index of *doc* where parsing failed.
+ The start index of *doc* where parsing failed.
- .. attribute:: lineno
+ .. attribute:: lineno
- The line corresponding to *pos*.
+ The line corresponding to *pos*.
- .. attribute:: colno
+ .. attribute:: colno
- The column corresponding to *pos*.
+ The column corresponding to *pos*.
.. versionadded:: 3.5
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
@@ -170,15 +170,15 @@
If both lowercase and uppercase environment variables exist (and disagree),
lowercase is preferred.
- .. note::
+ .. note::
- If the environment variable ``REQUEST_METHOD`` is set, which usually
- indicates your script is running in a CGI environment, the environment
- variable ``HTTP_PROXY`` (uppercase ``_PROXY``) will be ignored. This is
- because that variable can be injected by a client using the "Proxy:" HTTP
- header. If you need to use an HTTP proxy in a CGI environment, either use
- ``ProxyHandler`` explicitly, or make sure the variable name is in
- lowercase (or at least the ``_proxy`` suffix).
+ If the environment variable ``REQUEST_METHOD`` is set, which usually
+ indicates your script is running in a CGI environment, the environment
+ variable ``HTTP_PROXY`` (uppercase ``_PROXY``) will be ignored. This is
+ because that variable can be injected by a client using the "Proxy:" HTTP
+ header. If you need to use an HTTP proxy in a CGI environment, either use
+ ``ProxyHandler`` explicitly, or make sure the variable name is in
+ lowercase (or at least the ``_proxy`` suffix).
The following classes are provided:
@@ -1407,48 +1407,48 @@
:class:`URLopener` objects will raise an :exc:`OSError` exception if the server
returns an error code.
- .. method:: open(fullurl, data=None)
+ .. method:: open(fullurl, data=None)
- Open *fullurl* using the appropriate protocol. This method sets up cache and
- proxy information, then calls the appropriate open method with its input
- arguments. If the scheme is not recognized, :meth:`open_unknown` is called.
- The *data* argument has the same meaning as the *data* argument of
- :func:`urlopen`.
+ Open *fullurl* using the appropriate protocol. This method sets up cache and
+ proxy information, then calls the appropriate open method with its input
+ arguments. If the scheme is not recognized, :meth:`open_unknown` is called.
+ The *data* argument has the same meaning as the *data* argument of
+ :func:`urlopen`.
- .. method:: open_unknown(fullurl, data=None)
+ .. method:: open_unknown(fullurl, data=None)
- Overridable interface to open unknown URL types.
+ Overridable interface to open unknown URL types.
- .. method:: retrieve(url, filename=None, reporthook=None, data=None)
+ .. method:: retrieve(url, filename=None, reporthook=None, data=None)
- Retrieves the contents of *url* and places it in *filename*. The return value
- is a tuple consisting of a local filename and either an
- :class:`email.message.Message` object containing the response headers (for remote
- URLs) or ``None`` (for local URLs). The caller must then open and read the
- contents of *filename*. If *filename* is not given and the URL refers to a
- local file, the input filename is returned. If the URL is non-local and
- *filename* is not given, the filename is the output of :func:`tempfile.mktemp`
- with a suffix that matches the suffix of the last path component of the input
- URL. If *reporthook* is given, it must be a function accepting three numeric
- parameters: A chunk number, the maximum size chunks are read in and the total size of the download
- (-1 if unknown). It will be called once at the start and after each chunk of data is read from the
- network. *reporthook* is ignored for local URLs.
+ Retrieves the contents of *url* and places it in *filename*. The return value
+ is a tuple consisting of a local filename and either an
+ :class:`email.message.Message` object containing the response headers (for remote
+ URLs) or ``None`` (for local URLs). The caller must then open and read the
+ contents of *filename*. If *filename* is not given and the URL refers to a
+ local file, the input filename is returned. If the URL is non-local and
+ *filename* is not given, the filename is the output of :func:`tempfile.mktemp`
+ with a suffix that matches the suffix of the last path component of the input
+ URL. If *reporthook* is given, it must be a function accepting three numeric
+ parameters: A chunk number, the maximum size chunks are read in and the total size of the download
+ (-1 if unknown). It will be called once at the start and after each chunk of data is read from the
+ network. *reporthook* is ignored for local URLs.
- If the *url* uses the :file:`http:` scheme identifier, the optional *data*
- argument may be given to specify a ``POST`` request (normally the request type
- is ``GET``). The *data* argument must in standard
- :mimetype:`application/x-www-form-urlencoded` format; see the
- :func:`urllib.parse.urlencode` function.
+ If the *url* uses the :file:`http:` scheme identifier, the optional *data*
+ argument may be given to specify a ``POST`` request (normally the request type
+ is ``GET``). The *data* argument must in standard
+ :mimetype:`application/x-www-form-urlencoded` format; see the
+ :func:`urllib.parse.urlencode` function.
- .. attribute:: version
+ .. attribute:: version
- Variable that specifies the user agent of the opener object. To get
- :mod:`urllib` to tell servers that it is a particular user agent, set this in a
- subclass as a class variable or in the constructor before calling the base
- constructor.
+ Variable that specifies the user agent of the opener object. To get
+ :mod:`urllib` to tell servers that it is a particular user agent, set this in a
+ subclass as a class variable or in the constructor before calling the base
+ constructor.
.. class:: FancyURLopener(...)
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list