summaryrefslogtreecommitdiffstats
path: root/Modules/_pickle.c
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-11-02 04:04:57 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2015-11-02 04:04:57 (GMT)
commit2eb819f7a82c7eb61f2d253894d9973f0ec21df2 (patch)
treec881e371e6ae948cbd725afd91fa8f5b0c6c940f /Modules/_pickle.c
parent56275dc1e2a2f354620189efd751fa90af2118e1 (diff)
parent7462b64911f1e2df2de2285ddbf8b156b5cdc418 (diff)
downloadcpython-2eb819f7a82c7eb61f2d253894d9973f0ec21df2.zip
cpython-2eb819f7a82c7eb61f2d253894d9973f0ec21df2.tar.gz
cpython-2eb819f7a82c7eb61f2d253894d9973f0ec21df2.tar.bz2
Issue #25523: Merge "a" to "an" fixes from 3.4 into 3.5
Diffstat (limited to 'Modules/_pickle.c')
-rw-r--r--Modules/_pickle.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index f3b73f1..5f38500 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -4100,7 +4100,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
@@ -4111,7 +4111,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);
@@ -6514,7 +6514,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*,
@@ -6531,7 +6531,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);
@@ -6950,7 +6950,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
@@ -6961,7 +6961,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();
@@ -7060,7 +7060,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*,
@@ -7076,7 +7076,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();