diff options
| author | Nick Coghlan <ncoghlan@gmail.com> | 2015-01-06 14:37:01 (GMT) |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2015-01-06 14:37:01 (GMT) |
| commit | 582acb75e9a03e21281fe3c3877b6d48a8f0fa8f (patch) | |
| tree | c8e497645e1ce8c0a6384a1063cac52d09dd02fe /Doc/glossary.rst | |
| parent | 5d575399bca935fec36d6a1ba538115406673415 (diff) | |
| parent | b9fdb7a452c2b6f7a628118b5f695bd061b62cc8 (diff) | |
| download | cpython-582acb75e9a03e21281fe3c3877b6d48a8f0fa8f.zip cpython-582acb75e9a03e21281fe3c3877b6d48a8f0fa8f.tar.gz cpython-582acb75e9a03e21281fe3c3877b6d48a8f0fa8f.tar.bz2 | |
Merge issue 19548 changes from 3.4
Diffstat (limited to 'Doc/glossary.rst')
| -rw-r--r-- | Doc/glossary.rst | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 87e2d8a..f5ce9d9 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -834,10 +834,13 @@ Glossary :meth:`~collections.somenamedtuple._asdict`. Examples of struct sequences include :data:`sys.float_info` and the return value of :func:`os.stat`. + text encoding + A codec which encodes Unicode strings to bytes. + text file A :term:`file object` able to read and write :class:`str` objects. Often, a text file actually accesses a byte-oriented datastream - and handles the text encoding automatically. + and handles the :term:`text encoding` automatically. .. seealso:: A :term:`binary file` reads and write :class:`bytes` objects. |