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 /Modules/_io | |
| 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 'Modules/_io')
| -rw-r--r-- | Modules/_io/_iomodule.c | 2 | ||||
| -rw-r--r-- | Modules/_io/textio.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c index 528bcd4..ec68170 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. */ |