summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2015-11-02 05:04:46 (GMT)
committerRaymond Hettinger <python@rcn.com>2015-11-02 05:04:46 (GMT)
commit0bdf9ea136c4acca2de0fe6ab799ab35d5b09fd2 (patch)
tree4b47f7e8db6a919ad9e1dd8da0f21144754e7ffa /Modules
parent67b97b8f8dc792aa7e1130a52a0ccc5069c400ed (diff)
parente56a9191000d2ff15d7550b9c852fa6dee9b8f50 (diff)
downloadcpython-0bdf9ea136c4acca2de0fe6ab799ab35d5b09fd2.zip
cpython-0bdf9ea136c4acca2de0fe6ab799ab35d5b09fd2.tar.gz
cpython-0bdf9ea136c4acca2de0fe6ab799ab35d5b09fd2.tar.bz2
merge
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_collectionsmodule.c2
-rw-r--r--Modules/_ctypes/libffi/src/x86/darwin64.S2
-rw-r--r--Modules/_ctypes/libffi/src/x86/unix64.S2
-rw-r--r--Modules/_ctypes/libffi_osx/x86/darwin64.S2
-rw-r--r--Modules/_hashopenssl.c2
-rw-r--r--Modules/_io/_iomodule.c2
-rw-r--r--Modules/_io/textio.c4
-rw-r--r--Modules/_pickle.c16
-rw-r--r--Modules/atexitmodule.c2
-rw-r--r--Modules/audioop.c4
-rw-r--r--Modules/clinic/_pickle.c.h10
-rw-r--r--Modules/expat/pyexpatns.h2
-rw-r--r--Modules/hashlib.h2
-rw-r--r--Modules/readline.c2
14 files changed, 27 insertions, 27 deletions
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index c12d43e..c9e4568 100644
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -742,7 +742,7 @@ volume rotations should take care not to penalize the common case.
Conceptually, a rotate by one is equivalent to a pop on one side and an
append on the other. However, a pop/append pair is unnecessarily slow
-because it requires a incref/decref pair for an object located randomly
+because it requires an incref/decref pair for an object located randomly
in memory. It is better to just move the object pointer from one block
to the next without changing the reference count.
diff --git a/Modules/_ctypes/libffi/src/x86/darwin64.S b/Modules/_ctypes/libffi/src/x86/darwin64.S
index 2f7394e..0c72ed2 100644
--- a/Modules/_ctypes/libffi/src/x86/darwin64.S
+++ b/Modules/_ctypes/libffi/src/x86/darwin64.S
@@ -350,7 +350,7 @@ LASFDE1:
.set L$set$3,LUW1-LUW0
.long L$set$3
- /* New stack frame based off rbp. This is a itty bit of unwind
+ /* New stack frame based off rbp. This is an itty bit of unwind
trickery in that the CFA *has* changed. There is no easy way
to describe it correctly on entry to the function. Fortunately,
it doesn't matter too much since at all points we can correctly
diff --git a/Modules/_ctypes/libffi/src/x86/unix64.S b/Modules/_ctypes/libffi/src/x86/unix64.S
index dcd6bc7..45a0ed7 100644
--- a/Modules/_ctypes/libffi/src/x86/unix64.S
+++ b/Modules/_ctypes/libffi/src/x86/unix64.S
@@ -366,7 +366,7 @@ ffi_closure_unix64:
.byte 0x4 /* DW_CFA_advance_loc4 */
.long .LUW1-.LUW0
- /* New stack frame based off rbp. This is a itty bit of unwind
+ /* New stack frame based off rbp. This is an itty bit of unwind
trickery in that the CFA *has* changed. There is no easy way
to describe it correctly on entry to the function. Fortunately,
it doesn't matter too much since at all points we can correctly
diff --git a/Modules/_ctypes/libffi_osx/x86/darwin64.S b/Modules/_ctypes/libffi_osx/x86/darwin64.S
index 165d469..1286d33 100644
--- a/Modules/_ctypes/libffi_osx/x86/darwin64.S
+++ b/Modules/_ctypes/libffi_osx/x86/darwin64.S
@@ -351,7 +351,7 @@ LASFDE1:
.set L$set$3,LUW1-LUW0
.long L$set$3
- /* New stack frame based off rbp. This is a itty bit of unwind
+ /* New stack frame based off rbp. This is an itty bit of unwind
trickery in that the CFA *has* changed. There is no easy way
to describe it correctly on entry to the function. Fortunately,
it doesn't matter too much since at all points we can correctly
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
index 8ccc243..44765ac 100644
--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
@@ -684,7 +684,7 @@ _openssl_hash_name_mapper(const OBJ_NAME *openssl_obj_name, void *arg)
if (openssl_obj_name == NULL)
return;
/* Ignore aliased names, they pollute the list and OpenSSL appears to
- * have a its own definition of alias as the resulting list still
+ * have its own definition of alias as the resulting list still
* contains duplicate and alternate names for several algorithms. */
if (openssl_obj_name->alias)
return;
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
index 7428aed..d8aa1df 100644
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -75,7 +75,7 @@ PyDoc_STRVAR(module_doc,
"Another IOBase subclass, TextIOBase, deals with the encoding and decoding\n"
"of streams into text. TextIOWrapper, which extends it, is a buffered text\n"
"interface to a buffered raw stream (`BufferedIOBase`). Finally, StringIO\n"
-"is a in-memory stream for text.\n"
+"is an in-memory stream for text.\n"
"\n"
"Argument names are not part of the specification, and only the arguments\n"
"of open() are intended to be used as keyword arguments.\n"
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index c962c0b..b232b02 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -905,8 +905,8 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer,
if (self->encoding == NULL) {
catch_ImportError:
/*
- Importing locale can raise a ImportError because of
- _functools, and locale.getpreferredencoding can raise a
+ Importing locale can raise an ImportError because of
+ _functools, and locale.getpreferredencoding can raise an
ImportError if _locale is not available. These will happen
during module building.
*/
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 341ac0d..0e3a68e 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -4162,7 +4162,7 @@ version of Python needed to read the pickle produced.
The *file* argument must have a write() method that accepts a single
bytes argument. It can thus be a file object opened for binary
-writing, a io.BytesIO instance, or any other custom object that meets
+writing, an io.BytesIO instance, or any other custom object that meets
this interface.
If *fix_imports* is True and protocol is less than 3, pickle will try
@@ -4173,7 +4173,7 @@ to map the new Python 3 names to the old module names used in Python
static int
_pickle_Pickler___init___impl(PicklerObject *self, PyObject *file,
PyObject *protocol, int fix_imports)
-/*[clinic end generated code: output=b5f31078dab17fb0 input=b8cdeb7e3f5ee674]*/
+/*[clinic end generated code: output=b5f31078dab17fb0 input=4faabdbc763c2389]*/
{
_Py_IDENTIFIER(persistent_id);
_Py_IDENTIFIER(dispatch_table);
@@ -6576,7 +6576,7 @@ representation are ignored.
The argument *file* must have two methods, a read() method that takes
an integer argument, and a readline() method that requires no
arguments. Both methods should return bytes. Thus *file* can be a
-binary file object opened for reading, a io.BytesIO object, or any
+binary file object opened for reading, an io.BytesIO object, or any
other custom object that meets this interface.
Optional keyword arguments are *fix_imports*, *encoding* and *errors*,
@@ -6593,7 +6593,7 @@ static int
_pickle_Unpickler___init___impl(UnpicklerObject *self, PyObject *file,
int fix_imports, const char *encoding,
const char *errors)
-/*[clinic end generated code: output=e2c8ce748edc57b0 input=30b4dc9e976b890c]*/
+/*[clinic end generated code: output=e2c8ce748edc57b0 input=04ece661aa884837]*/
{
_Py_IDENTIFIER(persistent_load);
@@ -7012,7 +7012,7 @@ version of Python needed to read the pickle produced.
The *file* argument must have a write() method that accepts a single
bytes argument. It can thus be a file object opened for binary
-writing, a io.BytesIO instance, or any other custom object that meets
+writing, an io.BytesIO instance, or any other custom object that meets
this interface.
If *fix_imports* is True and protocol is less than 3, pickle will try
@@ -7023,7 +7023,7 @@ to map the new Python 3 names to the old module names used in Python
static PyObject *
_pickle_dump_impl(PyModuleDef *module, PyObject *obj, PyObject *file,
PyObject *protocol, int fix_imports)
-/*[clinic end generated code: output=0de7dff89c406816 input=e9e5fdd48de92eae]*/
+/*[clinic end generated code: output=0de7dff89c406816 input=830f8a64cef6f042]*/
{
PicklerObject *pickler = _Pickler_New();
@@ -7122,7 +7122,7 @@ representation are ignored.
The argument *file* must have two methods, a read() method that takes
an integer argument, and a readline() method that requires no
arguments. Both methods should return bytes. Thus *file* can be a
-binary file object opened for reading, a io.BytesIO object, or any
+binary file object opened for reading, an io.BytesIO object, or any
other custom object that meets this interface.
Optional keyword arguments are *fix_imports*, *encoding* and *errors*,
@@ -7138,7 +7138,7 @@ string instances as bytes objects.
static PyObject *
_pickle_load_impl(PyModuleDef *module, PyObject *file, int fix_imports,
const char *encoding, const char *errors)
-/*[clinic end generated code: output=798f1c57cb2b4eb1 input=da97372e38e510a6]*/
+/*[clinic end generated code: output=798f1c57cb2b4eb1 input=2df7c7a1e6742204]*/
{
PyObject *result;
UnpicklerObject *unpickler = _Unpickler_New();
diff --git a/Modules/atexitmodule.c b/Modules/atexitmodule.c
index 739c188..3cdf2d7 100644
--- a/Modules/atexitmodule.c
+++ b/Modules/atexitmodule.c
@@ -257,7 +257,7 @@ atexit_free(PyObject *m)
PyDoc_STRVAR(atexit_unregister__doc__,
"unregister(func) -> None\n\
\n\
-Unregister a exit function which was previously registered using\n\
+Unregister an exit function which was previously registered using\n\
atexit.register\n\
\n\
func - function to be unregistered");
diff --git a/Modules/audioop.c b/Modules/audioop.c
index bbc458f..3b05aec 100644
--- a/Modules/audioop.c
+++ b/Modules/audioop.c
@@ -112,7 +112,7 @@ static PyInt16 _st_ulaw2linear16[256] = {
/*
* linear2ulaw() accepts a 14-bit signed integer and encodes it as u-law data
- * stored in a unsigned char. This function should only be called with
+ * stored in an unsigned char. This function should only be called with
* the data shifted such that it only contains information in the lower
* 14-bits.
*
@@ -218,7 +218,7 @@ static PyInt16 _st_alaw2linear16[256] = {
/*
* linear2alaw() accepts an 13-bit signed integer and encodes it as A-law data
- * stored in a unsigned char. This function should only be called with
+ * stored in an unsigned char. This function should only be called with
* the data shifted such that it only contains information in the lower
* 13-bits.
*
diff --git a/Modules/clinic/_pickle.c.h b/Modules/clinic/_pickle.c.h
index b698ce8..a9f0c42 100644
--- a/Modules/clinic/_pickle.c.h
+++ b/Modules/clinic/_pickle.c.h
@@ -77,7 +77,7 @@ PyDoc_STRVAR(_pickle_Pickler___init____doc__,
"\n"
"The *file* argument must have a write() method that accepts a single\n"
"bytes argument. It can thus be a file object opened for binary\n"
-"writing, a io.BytesIO instance, or any other custom object that meets\n"
+"writing, an io.BytesIO instance, or any other custom object that meets\n"
"this interface.\n"
"\n"
"If *fix_imports* is True and protocol is less than 3, pickle will try\n"
@@ -260,7 +260,7 @@ PyDoc_STRVAR(_pickle_Unpickler___init____doc__,
"The argument *file* must have two methods, a read() method that takes\n"
"an integer argument, and a readline() method that requires no\n"
"arguments. Both methods should return bytes. Thus *file* can be a\n"
-"binary file object opened for reading, a io.BytesIO object, or any\n"
+"binary file object opened for reading, an io.BytesIO object, or any\n"
"other custom object that meets this interface.\n"
"\n"
"Optional keyword arguments are *fix_imports*, *encoding* and *errors*,\n"
@@ -369,7 +369,7 @@ PyDoc_STRVAR(_pickle_dump__doc__,
"\n"
"The *file* argument must have a write() method that accepts a single\n"
"bytes argument. It can thus be a file object opened for binary\n"
-"writing, a io.BytesIO instance, or any other custom object that meets\n"
+"writing, an io.BytesIO instance, or any other custom object that meets\n"
"this interface.\n"
"\n"
"If *fix_imports* is True and protocol is less than 3, pickle will try\n"
@@ -462,7 +462,7 @@ PyDoc_STRVAR(_pickle_load__doc__,
"The argument *file* must have two methods, a read() method that takes\n"
"an integer argument, and a readline() method that requires no\n"
"arguments. Both methods should return bytes. Thus *file* can be a\n"
-"binary file object opened for reading, a io.BytesIO object, or any\n"
+"binary file object opened for reading, an io.BytesIO object, or any\n"
"other custom object that meets this interface.\n"
"\n"
"Optional keyword arguments are *fix_imports*, *encoding* and *errors*,\n"
@@ -545,4 +545,4 @@ _pickle_loads(PyModuleDef *module, PyObject *args, PyObject *kwargs)
exit:
return return_value;
}
-/*[clinic end generated code: output=06f3a5233298448e input=a9049054013a1b77]*/
+/*[clinic end generated code: output=aecd61660d1cf31d input=a9049054013a1b77]*/
diff --git a/Modules/expat/pyexpatns.h b/Modules/expat/pyexpatns.h
index 2f2f4f9..999c5c7 100644
--- a/Modules/expat/pyexpatns.h
+++ b/Modules/expat/pyexpatns.h
@@ -21,7 +21,7 @@
*
*
* The Solution:
- * Prefix all a exported symbols with "PyExpat_". This is similar to
+ * Prefix all exported symbols with "PyExpat_". This is similar to
* what Mozilla does for some common libs:
* http://lxr.mozilla.org/seamonkey/source/modules/libimg/png/mozpngconf.h#115
*
diff --git a/Modules/hashlib.h b/Modules/hashlib.h
index 51c68f6..3580453 100644
--- a/Modules/hashlib.h
+++ b/Modules/hashlib.h
@@ -30,7 +30,7 @@
/*
* Helper code to synchronize access to the hash object when the GIL is
* released around a CPU consuming hashlib operation. All code paths that
- * access a mutable part of obj must be enclosed in a ENTER_HASHLIB /
+ * access a mutable part of obj must be enclosed in an ENTER_HASHLIB /
* LEAVE_HASHLIB block or explicitly acquire and release the lock inside
* a PY_BEGIN / END_ALLOW_THREADS block if they wish to release the GIL for
* an operation.
diff --git a/Modules/readline.c b/Modules/readline.c
index 451a6ed..939ff1a 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -1236,7 +1236,7 @@ call_readline(FILE *sys_stdin, FILE *sys_stdout, const char *prompt)
return NULL;
}
- /* We got an EOF, return a empty string. */
+ /* We got an EOF, return an empty string. */
if (p == NULL) {
p = PyMem_RawMalloc(1);
if (p != NULL)