From: Sandro Tosi Date: Sat, 2 Jun 2012 21:41:19 +0000 (+0200) Subject: backport c4bd68be5fc6 to 3.2 X-Git-Tag: v3.3.0b1~302^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f671338def9208bad1e5032c8c08a6cade46491;p=python backport c4bd68be5fc6 to 3.2 --- diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 21b92a99a1..bf1234db2d 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -194,7 +194,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`.