summaryrefslogtreecommitdiffstats
path: root/Doc/library/asyncore.rst
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-09-15 11:25:11 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-09-15 11:25:11 (GMT)
commit25d535ea6a443f467eacfc9f487c90120972ca7f (patch)
tree23feb014181a59162d9044813d8d562aee6885b6 /Doc/library/asyncore.rst
parentecbf2dea367b8dd971ccf4f3e3814afbb9ed5af9 (diff)
downloadcpython-25d535ea6a443f467eacfc9f487c90120972ca7f.zip
cpython-25d535ea6a443f467eacfc9f487c90120972ca7f.tar.gz
cpython-25d535ea6a443f467eacfc9f487c90120972ca7f.tar.bz2
Merged revisions 84827-84829 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84827 | antoine.pitrou | 2010-09-15 11:58:26 +0200 (mer., 15 sept. 2010) | 3 lines Add a glossary entry for file objects. ........ r84828 | antoine.pitrou | 2010-09-15 12:08:31 +0200 (mer., 15 sept. 2010) | 3 lines Update file-related information in the FAQ. ........ r84829 | antoine.pitrou | 2010-09-15 13:11:28 +0200 (mer., 15 sept. 2010) | 3 lines Add cross-references to the glossary entry for file objects. ........
Diffstat (limited to 'Doc/library/asyncore.rst')
-rw-r--r--Doc/library/asyncore.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/asyncore.rst b/Doc/library/asyncore.rst
index 60d4d03..8cdfe20 100644
--- a/Doc/library/asyncore.rst
+++ b/Doc/library/asyncore.rst
@@ -224,9 +224,9 @@ any that have been added to the map during asynchronous service) is closed.
.. class:: file_dispatcher()
- A file_dispatcher takes a file descriptor or file object along with an
- optional map argument and wraps it for use with the :cfunc:`poll` or
- :cfunc:`loop` functions. If provided a file object or anything with a
+ A file_dispatcher takes a file descriptor or :term:`file object` along
+ with an optional map argument and wraps it for use with the :cfunc:`poll`
+ or :cfunc:`loop` functions. If provided a file object or anything with a
:cfunc:`fileno` method, that method will be called and passed to the
:class:`file_wrapper` constructor. Availability: UNIX.