[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #25161: Merge full stops from 3.4 into 3.5
martin.panter
python-checkins at python.org
Sat Oct 10 06:53:40 EDT 2015
https://hg.python.org/cpython/rev/be34d96e2184
changeset: 98643:be34d96e2184
branch: 3.5
parent: 98640:46df76819b79
parent: 98642:4dfead9635e5
user: Martin Panter <vadmium+py at gmail.com>
date: Sat Oct 10 10:44:25 2015 +0000
summary:
Issue #25161: Merge full stops from 3.4 into 3.5
files:
Doc/c-api/code.rst | 2 +-
Doc/c-api/gen.rst | 2 +-
Doc/c-api/veryhigh.rst | 2 +-
Doc/distutils/apiref.rst | 2 +-
Doc/glossary.rst | 2 +-
Doc/library/2to3.rst | 2 +-
Doc/library/argparse.rst | 2 +-
Doc/library/asyncio-protocol.rst | 2 +-
Doc/library/bdb.rst | 2 +-
Doc/library/contextlib.rst | 2 +-
Doc/library/decimal.rst | 2 +-
Doc/library/email.charset.rst | 2 +-
Doc/library/enum.rst | 2 +-
Doc/library/exceptions.rst | 2 +-
Doc/library/fractions.rst | 2 +-
Doc/library/http.cookiejar.rst | 2 +-
Doc/library/http.cookies.rst | 2 +-
Doc/library/importlib.rst | 2 +-
Doc/library/json.rst | 2 +-
Doc/library/locale.rst | 2 +-
Doc/library/logging.handlers.rst | 2 +-
Doc/library/modulefinder.rst | 2 +-
Doc/library/msvcrt.rst | 2 +-
Doc/library/multiprocessing.rst | 6 +++---
Doc/library/pickle.rst | 2 +-
Doc/library/platform.rst | 2 +-
Doc/library/plistlib.rst | 2 +-
Doc/library/shutil.rst | 2 +-
Doc/library/sys.rst | 2 +-
Doc/library/tkinter.ttk.rst | 5 +++--
Doc/library/urllib.request.rst | 2 +-
Doc/library/wsgiref.rst | 2 +-
Doc/library/xml.dom.minidom.rst | 2 +-
Doc/library/xml.dom.rst | 2 +-
Doc/library/xml.etree.elementtree.rst | 2 +-
Doc/reference/datamodel.rst | 2 +-
Doc/reference/expressions.rst | 2 +-
Misc/ACKS | 1 +
38 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/Doc/c-api/code.rst b/Doc/c-api/code.rst
--- a/Doc/c-api/code.rst
+++ b/Doc/c-api/code.rst
@@ -29,7 +29,7 @@
.. c:function:: int PyCode_Check(PyObject *co)
- Return true if *co* is a :class:`code` object
+ Return true if *co* is a :class:`code` object.
.. c:function:: int PyCode_GetNumFree(PyCodeObject *co)
diff --git a/Doc/c-api/gen.rst b/Doc/c-api/gen.rst
--- a/Doc/c-api/gen.rst
+++ b/Doc/c-api/gen.rst
@@ -17,7 +17,7 @@
.. c:var:: PyTypeObject PyGen_Type
- The type object corresponding to generator objects
+ The type object corresponding to generator objects.
.. c:function:: int PyGen_Check(PyObject *ob)
diff --git a/Doc/c-api/veryhigh.rst b/Doc/c-api/veryhigh.rst
--- a/Doc/c-api/veryhigh.rst
+++ b/Doc/c-api/veryhigh.rst
@@ -201,7 +201,7 @@
.. c:function:: struct _node* PyParser_SimpleParseFile(FILE *fp, const char *filename, int start)
This is a simplified interface to :c:func:`PyParser_SimpleParseFileFlags` below,
- leaving *flags* set to ``0``
+ leaving *flags* set to ``0``.
.. c:function:: struct _node* PyParser_SimpleParseFileFlags(FILE *fp, const char *filename, int start, int flags)
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -928,7 +928,7 @@
Walk two filename lists in parallel, testing if each source is newer than its
corresponding target. Return a pair of lists (*sources*, *targets*) where
- source is newer than target, according to the semantics of :func:`newer`
+ source is newer than target, according to the semantics of :func:`newer`.
.. % % equivalent to a listcomp...
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -948,7 +948,7 @@
without interfering with the behaviour of other Python applications
running on the same system.
- See also :ref:`scripts-pyvenv`
+ See also :ref:`scripts-pyvenv`.
virtual machine
A computer defined entirely in software. Python's virtual machine
diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst
--- a/Doc/library/2to3.rst
+++ b/Doc/library/2to3.rst
@@ -271,7 +271,7 @@
.. 2to3fixer:: input
- Converts ``input(prompt)`` to ``eval(input(prompt))``
+ Converts ``input(prompt)`` to ``eval(input(prompt))``.
.. 2to3fixer:: intern
diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -2011,4 +2011,4 @@
``%(default)s`` and ``%(prog)s``.
* Replace the OptionParser constructor ``version`` argument with a call to
- ``parser.add_argument('--version', action='version', version='<the version>')``
+ ``parser.add_argument('--version', action='version', version='<the version>')``.
diff --git a/Doc/library/asyncio-protocol.rst b/Doc/library/asyncio-protocol.rst
--- a/Doc/library/asyncio-protocol.rst
+++ b/Doc/library/asyncio-protocol.rst
@@ -232,7 +232,7 @@
.. method:: kill(self)
- Kill the subprocess, as in :meth:`subprocess.Popen.kill`
+ Kill the subprocess, as in :meth:`subprocess.Popen.kill`.
On POSIX systems, the function sends SIGKILL to the subprocess.
On Windows, this method is an alias for :meth:`terminate`.
diff --git a/Doc/library/bdb.rst b/Doc/library/bdb.rst
--- a/Doc/library/bdb.rst
+++ b/Doc/library/bdb.rst
@@ -231,7 +231,7 @@
.. method:: set_until(frame)
Stop when the line with the line no greater than the current one is
- reached or when returning from current frame
+ reached or when returning from current frame.
.. method:: set_trace([frame])
diff --git a/Doc/library/contextlib.rst b/Doc/library/contextlib.rst
--- a/Doc/library/contextlib.rst
+++ b/Doc/library/contextlib.rst
@@ -553,7 +553,7 @@
Due to the way the decorator protocol works, a callback function
declared this way cannot take any parameters. Instead, any resources to
-be released must be accessed as closure variables
+be released must be accessed as closure variables.
Using a context manager as a function decorator
diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -841,7 +841,7 @@
Engineering notation has an exponent which is a multiple of 3, so there
are up to 3 digits left of the decimal place. For example, converts
- ``Decimal('123E+1')`` to ``Decimal('1.23E+3')``
+ ``Decimal('123E+1')`` to ``Decimal('1.23E+3')``.
.. method:: to_integral(rounding=None, context=None)
diff --git a/Doc/library/email.charset.rst b/Doc/library/email.charset.rst
--- a/Doc/library/email.charset.rst
+++ b/Doc/library/email.charset.rst
@@ -234,5 +234,5 @@
*charset* is the canonical name of a character set. *codecname* is the name of a
Python codec, as appropriate for the second argument to the :class:`str`'s
- :meth:`~str.encode` method
+ :meth:`~str.encode` method.
diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst
--- a/Doc/library/enum.rst
+++ b/Doc/library/enum.rst
@@ -714,7 +714,7 @@
class, such as `list(Color)` or `some_var in Color`. :class:`EnumMeta` is
responsible for ensuring that various other methods on the final :class:`Enum`
class are correct (such as :meth:`__new__`, :meth:`__getnewargs__`,
-:meth:`__str__` and :meth:`__repr__`)
+:meth:`__str__` and :meth:`__repr__`).
Enum Members (aka instances)
diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -635,7 +635,7 @@
.. exception:: SyntaxWarning
- Base class for warnings about dubious syntax
+ Base class for warnings about dubious syntax.
.. exception:: RuntimeWarning
diff --git a/Doc/library/fractions.rst b/Doc/library/fractions.rst
--- a/Doc/library/fractions.rst
+++ b/Doc/library/fractions.rst
@@ -97,7 +97,7 @@
This class method constructs a :class:`Fraction` representing the exact
value of *flt*, which must be a :class:`float`. Beware that
- ``Fraction.from_float(0.3)`` is not the same value as ``Fraction(3, 10)``
+ ``Fraction.from_float(0.3)`` is not the same value as ``Fraction(3, 10)``.
.. note::
diff --git a/Doc/library/http.cookiejar.rst b/Doc/library/http.cookiejar.rst
--- a/Doc/library/http.cookiejar.rst
+++ b/Doc/library/http.cookiejar.rst
@@ -540,7 +540,7 @@
.. attribute:: DefaultCookiePolicy.strict_ns_unverifiable
- apply RFC 2965 rules on unverifiable transactions even to Netscape cookies
+ Apply RFC 2965 rules on unverifiable transactions even to Netscape cookies.
.. attribute:: DefaultCookiePolicy.strict_ns_domain
diff --git a/Doc/library/http.cookies.rst b/Doc/library/http.cookies.rst
--- a/Doc/library/http.cookies.rst
+++ b/Doc/library/http.cookies.rst
@@ -84,7 +84,7 @@
Return an encoded value. *val* can be any type, but return value must be a
string. This method does nothing in :class:`BaseCookie` --- it exists so it can
- be overridden
+ be overridden.
In general, it should be the case that :meth:`value_encode` and
:meth:`value_decode` are inverses on the range of *value_decode*.
diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -747,7 +747,7 @@
modules recognized by the standard import machinery. This is a
helper for code which simply needs to know if a filesystem path
potentially refers to a module without needing any details on the kind
- of module (for example, :func:`inspect.getmodulename`)
+ of module (for example, :func:`inspect.getmodulename`).
.. versionadded:: 3.3
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -339,7 +339,7 @@
.. method:: decode(s)
Return the Python representation of *s* (a :class:`str` instance
- containing a JSON document)
+ containing a JSON document).
:exc:`JSONDecodeError` will be raised if the given JSON document is not
valid.
diff --git a/Doc/library/locale.rst b/Doc/library/locale.rst
--- a/Doc/library/locale.rst
+++ b/Doc/library/locale.rst
@@ -204,7 +204,7 @@
.. data:: RADIXCHAR
- Get the radix character (decimal dot, decimal comma, etc.)
+ Get the radix character (decimal dot, decimal comma, etc.).
.. data:: THOUSEP
diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -230,7 +230,7 @@
renamed to the destination.
:param source: The source filename. This is normally the base
- filename, e.g. 'test.log'
+ filename, e.g. 'test.log'.
:param dest: The destination filename. This is normally
what the source is rotated to, e.g. 'test.log.1'.
diff --git a/Doc/library/modulefinder.rst b/Doc/library/modulefinder.rst
--- a/Doc/library/modulefinder.rst
+++ b/Doc/library/modulefinder.rst
@@ -53,7 +53,7 @@
.. attribute:: modules
A dictionary mapping module names to modules. See
- :ref:`modulefinder-example`
+ :ref:`modulefinder-example`.
.. _modulefinder-example:
diff --git a/Doc/library/msvcrt.rst b/Doc/library/msvcrt.rst
--- a/Doc/library/msvcrt.rst
+++ b/Doc/library/msvcrt.rst
@@ -18,7 +18,7 @@
The module implements both the normal and wide char variants of the console I/O
api. The normal API deals only with ASCII characters and is of limited use
for internationalized applications. The wide char API should be used where
-ever possible
+ever possible.
.. versionchanged:: 3.3
Operations in this module now raise :exc:`OSError` where :exc:`IOError`
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1939,7 +1939,7 @@
raised by :meth:`_callmethod`.
Note in particular that an exception will be raised if *methodname* has
- not been *exposed*
+ not been *exposed*.
An example of the usage of :meth:`_callmethod`:
@@ -2045,7 +2045,7 @@
If *callback* is specified then it should be a callable which accepts a
single argument. When the result becomes ready *callback* is applied to
it, that is unless the call failed, in which case the *error_callback*
- is applied instead
+ is applied instead.
If *error_callback* is specified then it should be a callable which
accepts a single argument. If the target function fails, then
@@ -2070,7 +2070,7 @@
If *callback* is specified then it should be a callable which accepts a
single argument. When the result becomes ready *callback* is applied to
it, that is unless the call failed, in which case the *error_callback*
- is applied instead
+ is applied instead.
If *error_callback* is specified then it should be a callable which
accepts a single argument. If the target function fails, then
diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst
--- a/Doc/library/pickle.rst
+++ b/Doc/library/pickle.rst
@@ -235,7 +235,7 @@
.. function:: loads(bytes_object, \*, fix_imports=True, encoding="ASCII", errors="strict")
Read a pickled object hierarchy from a :class:`bytes` object and return the
- reconstituted object hierarchy specified therein
+ reconstituted object hierarchy specified therein.
The protocol version of the pickle is detected automatically, so no
protocol argument is needed. Bytes past the pickled object's
diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -117,7 +117,7 @@
.. function:: python_version()
- Returns the Python version as string ``'major.minor.patchlevel'``
+ Returns the Python version as string ``'major.minor.patchlevel'``.
Note that unlike the Python ``sys.version``, the returned value will always
include the patchlevel (it defaults to 0).
diff --git a/Doc/library/plistlib.rst b/Doc/library/plistlib.rst
--- a/Doc/library/plistlib.rst
+++ b/Doc/library/plistlib.rst
@@ -194,7 +194,7 @@
It has one attribute, :attr:`data`, that can be used to retrieve the Python
bytes object stored in it.
- .. deprecated:: 3.4 Use a :class:`bytes` object instead
+ .. deprecated:: 3.4 Use a :class:`bytes` object instead.
The following constants are available:
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -497,7 +497,7 @@
.. function:: get_archive_formats()
Return a list of supported formats for archiving.
- Each element of the returned sequence is a tuple ``(name, description)``
+ Each element of the returned sequence is a tuple ``(name, description)``.
By default :mod:`shutil` provides these formats:
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -641,7 +641,7 @@
:term:`struct sequence` :data:`sys.version_info` may be used for a more
human-friendly encoding of the same information.
- More details of ``hexversion`` can be found at :ref:`apiabiversion`
+ More details of ``hexversion`` can be found at :ref:`apiabiversion`.
.. data:: implementation
diff --git a/Doc/library/tkinter.ttk.rst b/Doc/library/tkinter.ttk.rst
--- a/Doc/library/tkinter.ttk.rst
+++ b/Doc/library/tkinter.ttk.rst
@@ -110,8 +110,9 @@
| class | Specifies the window class. The class is used when querying |
| | the option database for the window's other options, to |
| | determine the default bindtags for the window, and to select |
- | | the widget's default layout and style. This is a read-only |
- | | which may only be specified when the window is created |
+ | | the widget's default layout and style. This option is |
+ | | read-only, and may only be specified when the window is |
+ | | created. |
+-----------+--------------------------------------------------------------+
| cursor | Specifies the mouse cursor to be used for the widget. If set |
| | to the empty string (the default), the cursor is inherited |
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
@@ -202,7 +202,7 @@
``"Python-urllib/2.6"`` (on Python 2.6).
An example of using ``Content-Type`` header with *data* argument would be
- sending a dictionary like ``{"Content-Type":" application/x-www-form-urlencoded;charset=utf-8"}``
+ sending a dictionary like ``{"Content-Type":" application/x-www-form-urlencoded;charset=utf-8"}``.
The final two arguments are only of interest for correct handling
of third-party HTTP cookies:
diff --git a/Doc/library/wsgiref.rst b/Doc/library/wsgiref.rst
--- a/Doc/library/wsgiref.rst
+++ b/Doc/library/wsgiref.rst
@@ -506,7 +506,7 @@
Similar to :class:`BaseCGIHandler`, but designed for use with HTTP origin
servers. If you are writing an HTTP server implementation, you will probably
- want to subclass this instead of :class:`BaseCGIHandler`
+ want to subclass this instead of :class:`BaseCGIHandler`.
This class is a subclass of :class:`BaseHandler`. It overrides the
:meth:`__init__`, :meth:`get_stdin`, :meth:`get_stderr`, :meth:`add_cgi_vars`,
diff --git a/Doc/library/xml.dom.minidom.rst b/Doc/library/xml.dom.minidom.rst
--- a/Doc/library/xml.dom.minidom.rst
+++ b/Doc/library/xml.dom.minidom.rst
@@ -15,7 +15,7 @@
Model interface, with an API similar to that in other languages. It is intended
to be simpler than the full DOM and also significantly smaller. Users who are
not already proficient with the DOM should consider using the
-:mod:`xml.etree.ElementTree` module for their XML processing instead
+:mod:`xml.etree.ElementTree` module for their XML processing instead.
.. warning::
diff --git a/Doc/library/xml.dom.rst b/Doc/library/xml.dom.rst
--- a/Doc/library/xml.dom.rst
+++ b/Doc/library/xml.dom.rst
@@ -304,7 +304,7 @@
.. attribute:: Node.prefix
The part of the :attr:`tagName` preceding the colon if there is one, else the
- empty string. The value is a string, or ``None``
+ empty string. The value is a string, or ``None``.
.. attribute:: Node.namespaceURI
diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst
--- a/Doc/library/xml.etree.elementtree.rst
+++ b/Doc/library/xml.etree.elementtree.rst
@@ -891,7 +891,7 @@
Creates and returns a tree iterator for the root element. The iterator
loops over all elements in this tree, in section order. *tag* is the tag
- to look for (default is to return all elements)
+ to look for (default is to return all elements).
.. method:: iterfind(match, namespaces=None)
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1320,7 +1320,7 @@
object's :meth:`__hash__` must interoperate on builds of different bit
sizes, be sure to check the width on all supported builds. An easy way
to do this is with
- ``python -c "import sys; print(sys.hash_info.width)"``
+ ``python -c "import sys; print(sys.hash_info.width)"``.
If a class does not define an :meth:`__eq__` method it should not define a
:meth:`__hash__` operation either; if it defines :meth:`__eq__` but not
diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -371,7 +371,7 @@
(by returning a value from the sub-generator).
.. versionchanged:: 3.3
- Added ``yield from <expr>`` to delegate control flow to a subiterator
+ Added ``yield from <expr>`` to delegate control flow to a subiterator.
The parentheses may be omitted when the yield expression is the sole expression
on the right hand side of an assignment statement.
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1406,6 +1406,7 @@
Maciej Szulik
Arfrever Frehtes Taifersar Arahesis
Hideaki Takahashi
+Takase Arihiro
Indra Talip
Neil Tallim
Geoff Talvola
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list