fix instances of consecutive articles (closes #23221)

Patch by Karan Goel.
This commit is contained in:
Benjamin Peterson 2015-01-13 09:17:24 -05:00
parent 38dc250521
commit 82f34ada45
14 changed files with 14 additions and 13 deletions

View File

@ -64,7 +64,7 @@ in various ways. There is a separate error indicator for each thread.
Do not compare the return value to a specific exception; use Do not compare the return value to a specific exception; use
:c:func:`PyErr_ExceptionMatches` instead, shown below. (The comparison could :c:func:`PyErr_ExceptionMatches` instead, shown below. (The comparison could
easily fail since the exception may be an instance instead of a class, in the easily fail since the exception may be an instance instead of a class, in the
case of a class exception, or it may the a subclass of the expected exception.) case of a class exception, or it may be a subclass of the expected exception.)
.. c:function:: int PyErr_ExceptionMatches(PyObject *exc) .. c:function:: int PyErr_ExceptionMatches(PyObject *exc)

View File

@ -1182,7 +1182,7 @@ These functions are only intended to be used by advanced debugging tools.
.. c:function:: PyThreadState * PyInterpreterState_ThreadHead(PyInterpreterState *interp) .. c:function:: PyThreadState * PyInterpreterState_ThreadHead(PyInterpreterState *interp)
Return the a pointer to the first :c:type:`PyThreadState` object in the list of Return the pointer to the first :c:type:`PyThreadState` object in the list of
threads associated with the interpreter *interp*. threads associated with the interpreter *interp*.

View File

@ -131,7 +131,7 @@ The :attr:`ml_meth` is a C function pointer. The functions may be of different
types, but they always return :c:type:`PyObject\*`. If the function is not of types, but they always return :c:type:`PyObject\*`. If the function is not of
the :c:type:`PyCFunction`, the compiler will require a cast in the method table. the :c:type:`PyCFunction`, the compiler will require a cast in the method table.
Even though :c:type:`PyCFunction` defines the first parameter as Even though :c:type:`PyCFunction` defines the first parameter as
:c:type:`PyObject\*`, it is common that the method implementation uses a the :c:type:`PyObject\*`, it is common that the method implementation uses the
specific C type of the *self* object. specific C type of the *self* object.
The :attr:`ml_flags` field is a bitfield which can include the following flags. The :attr:`ml_flags` field is a bitfield which can include the following flags.

View File

@ -964,7 +964,7 @@ directories.
.. function:: create_tree(base_dir, files[, mode=0o777, verbose=0, dry_run=0]) .. function:: create_tree(base_dir, files[, mode=0o777, verbose=0, dry_run=0])
Create all the empty directories under *base_dir* needed to put *files* there. Create all the empty directories under *base_dir* needed to put *files* there.
*base_dir* is just the a name of a directory which doesn't necessarily exist *base_dir* is just the name of a directory which doesn't necessarily exist
yet; *files* is a list of filenames to be interpreted relative to *base_dir*. yet; *files* is a list of filenames to be interpreted relative to *base_dir*.
*base_dir* + the directory portion of every file in *files* will be created if *base_dir* + the directory portion of every file in *files* will be created if
it doesn't already exist. *mode*, *verbose* and *dry_run* flags are as for it doesn't already exist. *mode*, *verbose* and *dry_run* flags are as for

View File

@ -1499,7 +1499,7 @@ where we have imported it. The patching should look like::
However, consider the alternative scenario where instead of ``from a import However, consider the alternative scenario where instead of ``from a import
SomeClass`` module b does ``import a`` and ``some_function`` uses ``a.SomeClass``. Both SomeClass`` module b does ``import a`` and ``some_function`` uses ``a.SomeClass``. Both
of these import forms are common. In this case the class we want to patch is of these import forms are common. In this case the class we want to patch is
being looked up on the a module and so we have to patch ``a.SomeClass`` instead:: being looked up in the module and so we have to patch ``a.SomeClass`` instead::
@patch('a.SomeClass') @patch('a.SomeClass')

View File

@ -150,7 +150,7 @@
/* Report that a new memory at "address" of size "size" has been allocated. /* Report that a new memory at "address" of size "size" has been allocated.
This might be used when the memory has been retrieved from a free list and This might be used when the memory has been retrieved from a free list and
is about to be reused, or when a the locking discipline for a variable is about to be reused, or when the locking discipline for a variable
changes. */ changes. */
#define _Py_ANNOTATE_NEW_MEMORY(address, size) \ #define _Py_ANNOTATE_NEW_MEMORY(address, size) \
AnnotateNewMemory(__FILE__, __LINE__, address, size) AnnotateNewMemory(__FILE__, __LINE__, address, size)

View File

@ -605,7 +605,7 @@ PyAPI_FUNC(PyObject*) PyUnicode_New(
); );
#endif #endif
/* Initializes the canonical string representation from a the deprecated /* Initializes the canonical string representation from the deprecated
wstr/Py_UNICODE representation. This function is used to convert Unicode wstr/Py_UNICODE representation. This function is used to convert Unicode
objects which were created using the old API to the new flexible format objects which were created using the old API to the new flexible format
introduced with PEP 393. introduced with PEP 393.

View File

@ -81,7 +81,7 @@ def create_tree(base_dir, files, mode=0o777, verbose=1, dry_run=0):
"""Create all the empty directories under 'base_dir' needed to put 'files' """Create all the empty directories under 'base_dir' needed to put 'files'
there. there.
'base_dir' is just the a name of a directory which doesn't necessarily 'base_dir' is just the name of a directory which doesn't necessarily
exist yet; 'files' is a list of filenames to be interpreted relative to exist yet; 'files' is a list of filenames to be interpreted relative to
'base_dir'. 'base_dir' + the directory portion of every file in 'files' 'base_dir'. 'base_dir' + the directory portion of every file in 'files'
will be created if it doesn't already exist. 'mode', 'verbose' and will be created if it doesn't already exist. 'mode', 'verbose' and

View File

@ -1792,7 +1792,7 @@ class FileCookieJar(CookieJar):
def lwp_cookie_str(cookie): def lwp_cookie_str(cookie):
"""Return string representation of Cookie in an the LWP cookie file format. """Return string representation of Cookie in the LWP cookie file format.
Actually, the format is extended a bit -- see module docstring. Actually, the format is extended a bit -- see module docstring.

View File

@ -35,7 +35,7 @@ class FixExitfunc(fixer_base.BaseFix):
self.sys_import = None self.sys_import = None
def transform(self, node, results): def transform(self, node, results):
# First, find a the sys import. We'll just hope it's global scope. # First, find the sys import. We'll just hope it's global scope.
if "sys_import" in results: if "sys_import" in results:
if self.sys_import is None: if self.sys_import is None:
self.sys_import = results["sys_import"] self.sys_import = results["sys_import"]

View File

@ -299,7 +299,7 @@ if hasattr(_socket.socket, "share"):
def fromshare(info): def fromshare(info):
""" fromshare(info) -> socket object """ fromshare(info) -> socket object
Create a socket object from a the bytes object returned by Create a socket object from the bytes object returned by
socket.share(pid). socket.share(pid).
""" """
return socket(0, 0, 0, info) return socket(0, 0, 0, info)

View File

@ -644,7 +644,7 @@ class TestOptionalsChoices(ParserTestCase):
class TestOptionalsRequired(ParserTestCase): class TestOptionalsRequired(ParserTestCase):
"""Tests the an optional action that is required""" """Tests an optional action that is required"""
argument_signatures = [ argument_signatures = [
Sig('-x', type=int, required=True), Sig('-x', type=int, required=True),

View File

@ -483,6 +483,7 @@ Yannick Gingras
Matt Giuca Matt Giuca
Wim Glenn Wim Glenn
Michael Goderbauer Michael Goderbauer
Karan Goel
Jeroen Van Goey Jeroen Van Goey
Christoph Gohlke Christoph Gohlke
Tim Golden Tim Golden

View File

@ -4830,7 +4830,7 @@ Pointer_set_contents(CDataObject *self, PyObject *value, void *closure)
*(void **)self->b_ptr = dst->b_ptr; *(void **)self->b_ptr = dst->b_ptr;
/* /*
A Pointer instance must keep a the value it points to alive. So, a A Pointer instance must keep the value it points to alive. So, a
pointer instance has b_length set to 2 instead of 1, and we set pointer instance has b_length set to 2 instead of 1, and we set
'value' itself as the second item of the b_objects list, additionally. 'value' itself as the second item of the b_objects list, additionally.
*/ */