Commit 604d49bf authored by Benjamin Peterson's avatar Benjamin Peterson

fix instances of consecutive articles (closes #23221)

Patch by Karan Goel.
parent b699945c
...@@ -70,7 +70,7 @@ is a separate error indicator for each thread. ...@@ -70,7 +70,7 @@ 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)
......
...@@ -1136,7 +1136,7 @@ These functions are only intended to be used by advanced debugging tools. ...@@ -1136,7 +1136,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*.
.. versionadded:: 2.2 .. versionadded:: 2.2
......
...@@ -122,7 +122,7 @@ The :attr:`ml_meth` is a C function pointer. The functions may be of different ...@@ -122,7 +122,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.
......
...@@ -970,7 +970,7 @@ directories. ...@@ -970,7 +970,7 @@ directories.
.. function:: create_tree(base_dir, files[, mode=0777, verbose=0, dry_run=0]) .. function:: create_tree(base_dir, files[, mode=0777, 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
......
...@@ -18,7 +18,7 @@ from cookielib import (_warn_unhandled_exception, FileCookieJar, LoadError, ...@@ -18,7 +18,7 @@ from cookielib import (_warn_unhandled_exception, FileCookieJar, LoadError,
iso2time, time2isoz) iso2time, time2isoz)
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.
......
...@@ -83,7 +83,7 @@ def create_tree(base_dir, files, mode=0777, verbose=1, dry_run=0): ...@@ -83,7 +83,7 @@ def create_tree(base_dir, files, mode=0777, 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
......
...@@ -35,7 +35,7 @@ class FixExitfunc(fixer_base.BaseFix): ...@@ -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"]
......
...@@ -646,7 +646,7 @@ class TestOptionalsChoices(ParserTestCase): ...@@ -646,7 +646,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),
......
...@@ -475,6 +475,7 @@ Yannick Gingras ...@@ -475,6 +475,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
......
...@@ -5060,7 +5060,7 @@ Pointer_set_contents(CDataObject *self, PyObject *value, void *closure) ...@@ -5060,7 +5060,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.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment