[Python-checkins] cpython (3.4): fix instances of consecutive articles (closes #23221)
benjamin.peterson
python-checkins at python.org
Tue Jan 13 15:20:40 CET 2015
https://hg.python.org/cpython/rev/b168c41f2e3f
changeset: 94122:b168c41f2e3f
branch: 3.4
parent: 94120:1544bdc409be
user: Benjamin Peterson <benjamin at python.org>
date: Tue Jan 13 09:17:24 2015 -0500
summary:
fix instances of consecutive articles (closes #23221)
Patch by Karan Goel.
files:
Doc/c-api/exceptions.rst | 2 +-
Doc/c-api/init.rst | 2 +-
Doc/c-api/structures.rst | 2 +-
Doc/distutils/apiref.rst | 2 +-
Doc/library/unittest.mock.rst | 2 +-
Include/dynamic_annotations.h | 2 +-
Include/unicodeobject.h | 2 +-
Lib/distutils/dir_util.py | 2 +-
Lib/http/cookiejar.py | 2 +-
Lib/lib2to3/fixes/fix_exitfunc.py | 2 +-
Lib/socket.py | 2 +-
Lib/test/test_argparse.py | 2 +-
Misc/ACKS | 1 +
Modules/_ctypes/_ctypes.c | 2 +-
14 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
--- a/Doc/c-api/exceptions.rst
+++ b/Doc/c-api/exceptions.rst
@@ -64,7 +64,7 @@
Do not compare the return value to a specific exception; use
: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
- 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)
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -1182,7 +1182,7 @@
.. 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*.
diff --git a/Doc/c-api/structures.rst b/Doc/c-api/structures.rst
--- a/Doc/c-api/structures.rst
+++ b/Doc/c-api/structures.rst
@@ -131,7 +131,7 @@
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.
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.
The :attr:`ml_flags` field is a bitfield which can include the following flags.
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -964,7 +964,7 @@
.. 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.
- *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*.
*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
diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst
--- a/Doc/library/unittest.mock.rst
+++ b/Doc/library/unittest.mock.rst
@@ -1499,7 +1499,7 @@
However, consider the alternative scenario where instead of ``from a import
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
-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')
diff --git a/Include/dynamic_annotations.h b/Include/dynamic_annotations.h
--- a/Include/dynamic_annotations.h
+++ b/Include/dynamic_annotations.h
@@ -150,7 +150,7 @@
/* 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
- 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. */
#define _Py_ANNOTATE_NEW_MEMORY(address, size) \
AnnotateNewMemory(__FILE__, __LINE__, address, size)
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -605,7 +605,7 @@
);
#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
objects which were created using the old API to the new flexible format
introduced with PEP 393.
diff --git a/Lib/distutils/dir_util.py b/Lib/distutils/dir_util.py
--- a/Lib/distutils/dir_util.py
+++ b/Lib/distutils/dir_util.py
@@ -81,7 +81,7 @@
"""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
+ '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'. 'base_dir' + the directory portion of every file in 'files'
will be created if it doesn't already exist. 'mode', 'verbose' and
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
--- a/Lib/http/cookiejar.py
+++ b/Lib/http/cookiejar.py
@@ -1792,7 +1792,7 @@
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.
diff --git a/Lib/lib2to3/fixes/fix_exitfunc.py b/Lib/lib2to3/fixes/fix_exitfunc.py
--- a/Lib/lib2to3/fixes/fix_exitfunc.py
+++ b/Lib/lib2to3/fixes/fix_exitfunc.py
@@ -35,7 +35,7 @@
self.sys_import = None
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 self.sys_import is None:
self.sys_import = results["sys_import"]
diff --git a/Lib/socket.py b/Lib/socket.py
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -299,7 +299,7 @@
def fromshare(info):
""" 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).
"""
return socket(0, 0, 0, info)
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -644,7 +644,7 @@
class TestOptionalsRequired(ParserTestCase):
- """Tests the an optional action that is required"""
+ """Tests an optional action that is required"""
argument_signatures = [
Sig('-x', type=int, required=True),
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -483,6 +483,7 @@
Matt Giuca
Wim Glenn
Michael Goderbauer
+Karan Goel
Jeroen Van Goey
Christoph Gohlke
Tim Golden
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -4830,7 +4830,7 @@
*(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
'value' itself as the second item of the b_objects list, additionally.
*/
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list