diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2015-11-02 04:04:57 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2015-11-02 04:04:57 (GMT) |
| commit | 2eb819f7a82c7eb61f2d253894d9973f0ec21df2 (patch) | |
| tree | c881e371e6ae948cbd725afd91fa8f5b0c6c940f /Lib/pickle.py | |
| parent | 56275dc1e2a2f354620189efd751fa90af2118e1 (diff) | |
| parent | 7462b64911f1e2df2de2285ddbf8b156b5cdc418 (diff) | |
| download | cpython-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 'Lib/pickle.py')
| -rw-r--r-- | Lib/pickle.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/pickle.py b/Lib/pickle.py index e93057a..45fd383 100644 --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -358,7 +358,7 @@ class _Pickler: 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 + binary 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 @@ -984,7 +984,7 @@ class _Unpickler: 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 + can be a binary file object opened for reading, an io.BytesIO object, or any other custom object that meets this interface. The file-like object must have two methods, a read() method |