[Python-checkins] [3.6] Correct a couple of unbalanced parenthesis. (GH-10779). (GH-10945)

Serhiy Storchaka webhook-mailer at python.org
Wed Dec 5 16:08:54 EST 2018 

https://github.com/python/cpython/commit/62af9e6583b0b5f5069232c2a6bfd0ceca7fbf95
commit: 62af9e6583b0b5f5069232c2a6bfd0ceca7fbf95
branch: 3.6
author: Andre Delfino <adelfino at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2018-12-05T23:08:50+02:00
summary:

[3.6] Correct a couple of unbalanced parenthesis. (GH-10779). (GH-10945)

(cherry picked from commit 55f41e45b4318cbe19209f5144641344d0049fb8)

Co-authored-by: Andre Delfino <adelfino at gmail.com>

files:
M Doc/c-api/buffer.rst
M Doc/faq/extending.rst
M Doc/library/crypt.rst
M Doc/library/email.compat32-message.rst
M Doc/library/email.message.rst
M Doc/library/email.parser.rst
M Doc/library/exceptions.rst
M Doc/library/stdtypes.rst
M Doc/library/sysconfig.rst
M Doc/reference/expressions.rst
M Doc/using/windows.rst

diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst
index 5a9a46fc67e8..33abb5bb94d9 100644
--- a/Doc/c-api/buffer.rst
+++ b/Doc/c-api/buffer.rst
@@ -198,7 +198,7 @@ a buffer, see :c:func:`PyObject_GetBuffer`.
       indicates that no de-referencing should occur (striding in a contiguous
       memory block).
 
-      If all suboffsets are negative (i.e. no de-referencing is needed, then
+      If all suboffsets are negative (i.e. no de-referencing is needed), then
       this field must be NULL (the default value).
 
       This type of array representation is used by the Python Imaging Library
diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst
index fd04a83df33c..a0828172d48e 100644
--- a/Doc/faq/extending.rst
+++ b/Doc/faq/extending.rst
@@ -277,7 +277,7 @@ However sometimes you have to run the embedded Python interpreter in the same
 thread as your rest application and you can't allow the
 :c:func:`PyRun_InteractiveLoop` to stop while waiting for user input.  The one
 solution then is to call :c:func:`PyParser_ParseString` and test for ``e.error``
-equal to ``E_EOF``, which means the input is incomplete).  Here's a sample code
+equal to ``E_EOF``, which means the input is incomplete.  Here's a sample code
 fragment, untested, inspired by code from Alex Farber::
 
    #include <Python.h>
diff --git a/Doc/library/crypt.rst b/Doc/library/crypt.rst
index dbd427403847..bccc76b82621 100644
--- a/Doc/library/crypt.rst
+++ b/Doc/library/crypt.rst
@@ -84,7 +84,7 @@ The :mod:`crypt` module defines the following functions:
    may be available on all platforms), or a full encrypted password
    including salt, as returned by this function.  If *salt* is not
    provided, the strongest method will be used (as returned by
-   :func:`methods`.
+   :func:`methods`).
 
    Checking a password is usually done by passing the plain-text password
    as *word* and the full results of a previous :func:`crypt` call,
diff --git a/Doc/library/email.compat32-message.rst b/Doc/library/email.compat32-message.rst
index 9f85c5921c8f..ed380151769a 100644
--- a/Doc/library/email.compat32-message.rst
+++ b/Doc/library/email.compat32-message.rst
@@ -152,7 +152,7 @@ Here are the methods of the :class:`Message` class:
       Return ``True`` if the message's payload is a list of
       sub-\ :class:`Message` objects, otherwise return ``False``.  When
       :meth:`is_multipart` returns ``False``, the payload should be a string
-      object (which might be a CTE encoded binary payload.  (Note that
+      object (which might be a CTE encoded binary payload).  (Note that
       :meth:`is_multipart` returning ``True`` does not necessarily mean that
       "msg.get_content_maintype() == 'multipart'" will return the ``True``.
       For example, ``is_multipart`` will return ``True`` when the
diff --git a/Doc/library/email.message.rst b/Doc/library/email.message.rst
index ff5404553e96..77b8099a7d4c 100644
--- a/Doc/library/email.message.rst
+++ b/Doc/library/email.message.rst
@@ -92,7 +92,7 @@ message objects.
 
    .. method:: __str__()
 
-      Equivalent to `as_string(policy=self.policy.clone(utf8=True)`.  Allows
+      Equivalent to ``as_string(policy=self.policy.clone(utf8=True))``.  Allows
       ``str(msg)`` to produce a string containing the serialized message in a
       readable format.
 
@@ -379,7 +379,7 @@ message objects.
 
       Note that existing parameter values of headers may be accessed through
       the :attr:`~email.headerregistry.BaseHeader.params` attribute of the
-      header value (for example, ``msg['Content-Type'].params['charset']``.
+      header value (for example, ``msg['Content-Type'].params['charset']``).
 
       .. versionchanged:: 3.4 ``replace`` keyword was added.
 
@@ -679,7 +679,7 @@ message objects.
       specified by the current :mod:`~email.policy`.  If the added part
       has no :mailheader:`Content-Disposition` header, add one with the value
       ``attachment``.  This method can be used both for explicit attachments
-      (:mailheader:`Content-Disposition: attachment` and ``inline`` attachments
+      (:mailheader:`Content-Disposition: attachment`) and ``inline`` attachments
       (:mailheader:`Content-Disposition: inline`), by passing appropriate
       options to the ``content_manager``.
 
diff --git a/Doc/library/email.parser.rst b/Doc/library/email.parser.rst
index 49b4e992708a..d9a61616bbbd 100644
--- a/Doc/library/email.parser.rst
+++ b/Doc/library/email.parser.rst
@@ -164,7 +164,7 @@ message body, instead setting the payload to the raw body.
       envelope header.  The header block is terminated either by the end of the
       data or by a blank line.  Following the header block is the body of the
       message (which may contain MIME-encoded subparts, including subparts
-      with a :mailheader:`Content-Transfer-Encoding` of ``8bit``.
+      with a :mailheader:`Content-Transfer-Encoding` of ``8bit``).
 
       Optional *headersonly* is a flag specifying whether to stop parsing after
       reading the headers or not.  The default is ``False``, meaning it parses
diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
index cfa1649d4d1f..5c0cac8997c6 100644
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -52,7 +52,7 @@ will be set as :attr:`__cause__` on the raised exception. Setting
 :attr:`__cause__` also implicitly sets the :attr:`__suppress_context__`
 attribute to ``True``, so that using ``raise new_exc from None``
 effectively replaces the old exception with the new one for display
-purposes (e.g. converting :exc:`KeyError` to :exc:`AttributeError`, while
+purposes (e.g. converting :exc:`KeyError` to :exc:`AttributeError`), while
 leaving the old exception available in :attr:`__context__` for introspection
 when debugging.
 
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index a5fca9d46900..eed37454bc35 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -445,7 +445,7 @@ Notes:
 (4)
    Performing these calculations with at least one extra sign extension bit in
    a finite two's complement representation (a working bit-width of
-   ``1 + max(x.bit_length(), y.bit_length()`` or more) is sufficient to get the
+   ``1 + max(x.bit_length(), y.bit_length())`` or more) is sufficient to get the
    same result as if there were an infinite number of sign bits.
 
 
@@ -3175,7 +3175,7 @@ place, and instead produce new objects.
 
    Return a copy of the sequence left filled with ASCII ``b'0'`` digits to
    make a sequence of length *width*. A leading sign prefix (``b'+'``/
-   ``b'-'`` is handled by inserting the padding *after* the sign character
+   ``b'-'``) is handled by inserting the padding *after* the sign character
    rather than before. For :class:`bytes` objects, the original sequence is
    returned if *width* is less than or equal to ``len(seq)``.
 
diff --git a/Doc/library/sysconfig.rst b/Doc/library/sysconfig.rst
index f066a765d00e..d29396e01f25 100644
--- a/Doc/library/sysconfig.rst
+++ b/Doc/library/sysconfig.rst
@@ -188,7 +188,7 @@ Other functions
 
    Windows will return one of:
 
-   - win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
+   - win-amd64 (64bit Windows on AMD64, aka x86_64, Intel64, and EM64T)
    - win-ia64 (64bit Windows on Itanium)
    - win32 (all others - specifically, sys.platform is returned)
 
diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
index 05f62cd38ba9..e13072feebc1 100644
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -1603,7 +1603,7 @@ returned; otherwise, *y* is evaluated and the resulting value is returned.
 The expression ``x or y`` first evaluates *x*; if *x* is true, its value is
 returned; otherwise, *y* is evaluated and the resulting value is returned.
 
-(Note that neither :keyword:`and` nor :keyword:`or` restrict the value and type
+Note that neither :keyword:`and` nor :keyword:`or` restrict the value and type
 they return to ``False`` and ``True``, but rather return the last evaluated
 argument.  This is sometimes useful, e.g., if ``s`` is a string that should be
 replaced by a default value if it is empty, the expression ``s or 'foo'`` yields
diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
index a4294686fafe..0ee66561d2cf 100644
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -613,11 +613,11 @@ user's "application data" directory (i.e. the directory returned by calling the
 Windows function ``SHGetFolderPath`` with ``CSIDL_LOCAL_APPDATA``) and ``py.ini`` in the
 same directory as the launcher. The same .ini files are used for both the
 'console' version of the launcher (i.e. py.exe) and for the 'windows' version
-(i.e. pyw.exe)
+(i.e. pyw.exe).
 
 Customization specified in the "application directory" will have precedence over
 the one next to the executable, so a user, who may not have write access to the
-.ini file next to the launcher, can override commands in that global .ini file)
+.ini file next to the launcher, can override commands in that global .ini file.
 
 Customizing default Python versions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

More information about the Python-checkins mailing list