backport c4bd68be5fc6 to 2.7

This commit is contained in:
Sandro Tosi 2012-06-02 23:40:59 +02:00
parent 5fae78c09d
commit fd4c4b1e01

View File

@ -200,7 +200,7 @@ Glossary
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
on-disk file or to another 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`.