diff options
| author | Éric Araujo <merwok@netwok.org> | 2012-02-26 03:07:37 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2012-02-26 03:07:37 (GMT) |
| commit | 408026c7e8c019cf04372a4267c832241e18c62c (patch) | |
| tree | 4fcb98a84a03a0234306d716c45af02d9b38788e /Modules/_io | |
| parent | dfac6cc3e9df2a7352aaad3bb36390f850fc8ee6 (diff) | |
| parent | f527277b678b263b9d2f5ab52fb804fd1f62cde3 (diff) | |
| download | cpython-408026c7e8c019cf04372a4267c832241e18c62c.zip cpython-408026c7e8c019cf04372a4267c832241e18c62c.tar.gz cpython-408026c7e8c019cf04372a4267c832241e18c62c.tar.bz2 | |
Merge 3.2
Diffstat (limited to 'Modules/_io')
| -rw-r--r-- | Modules/_io/_iomodule.c | 2 | ||||
| -rw-r--r-- | Modules/_io/textio.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c index e046917..9aad479 100644 --- a/Modules/_io/_iomodule.c +++ b/Modules/_io/_iomodule.c @@ -59,7 +59,7 @@ PyDoc_STRVAR(module_doc, "\n" "At the top of the I/O hierarchy is the abstract base class IOBase. It\n" "defines the basic interface to a stream. Note, however, that there is no\n" -"seperation between reading and writing to streams; implementations are\n" +"separation between reading and writing to streams; implementations are\n" "allowed to throw an IOError if they do not support a given operation.\n" "\n" "Extending IOBase is RawIOBase which deals simply with the reading and\n" diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index 890a356..79c64ba 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -641,7 +641,7 @@ PyDoc_STRVAR(textiowrapper_doc, "enabled. With this enabled, on input, the lines endings '\\n', '\\r',\n" "or '\\r\\n' are translated to '\\n' before being returned to the\n" "caller. Conversely, on output, '\\n' is translated to the system\n" - "default line seperator, os.linesep. If newline is any other of its\n" + "default line separator, os.linesep. If newline is any other of its\n" "legal values, that newline becomes the newline when the file is read\n" "and it is returned untranslated. On output, '\\n' is converted to the\n" "newline.\n" |