summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-12-28 11:48:53 (GMT)
committerGeorg Brandl <georg@python.org>2010-12-28 11:48:53 (GMT)
commit9d9848e7763d5e5d6e6a3a6610928f4aeec95c41 (patch)
tree1b7a34552adf1bae5e9c9c94f30fd302d29f92d0
parentc16607691090c6b80dabd132bfaa1824e5054679 (diff)
downloadcpython-9d9848e7763d5e5d6e6a3a6610928f4aeec95c41.zip
cpython-9d9848e7763d5e5d6e6a3a6610928f4aeec95c41.tar.gz
cpython-9d9848e7763d5e5d6e6a3a6610928f4aeec95c41.tar.bz2
Rewrap.
-rw-r--r--Doc/glossary.rst26
1 files changed, 13 insertions, 13 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 4958d3b..c5b97e4 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -181,22 +181,22 @@ Glossary
not expressions.
extension module
- A module written in C or C++, using Python's C API to interact with the core and
- with user code.
+ A module written in C or C++, using Python's C API to interact with the
+ core and with user code.
file object
An object exposing a file-oriented API (with methods such as
- :meth:`read()` or :meth:`write()`) to an underlying resource.
- Depending on the way it was created, a file object can mediate access
- to a real on-disk file or to another other type of storage or
- communication device (for example standard input/output, in-memory
- buffers, sockets, pipes, etc.). File objects are also called
- :dfn:`file-like objects` or :dfn:`streams`.
-
- There are actually three categories of file objects: raw binary
- files, buffered binary files and text files. Their interfaces are
- defined in the :mod:`io` module. The canonical way to create a
- file object is by using the :func:`open` function.
+ :meth:`read()` or :meth:`write()`) to an underlying resource. Depending
+ on the way it was created, a file object can mediate access to a real
+ on-disk file or to another other type of storage or communication device
+ (for example standard input/output, in-memory buffers, sockets, pipes,
+ etc.). File objects are also called :dfn:`file-like objects` or
+ :dfn:`streams`.
+
+ There are actually three categories of file objects: raw binary files,
+ buffered binary files and text files. Their interfaces are defined in the
+ :mod:`io` module. The canonical way to create a file object is by using
+ the :func:`open` function.
file-like object
A synonym for :term:`file object`.