diff options
| author | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-16 18:03:52 (GMT) |
|---|---|---|
| committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-16 18:03:52 (GMT) |
| commit | ea0b22a167f25deaf170da2c321fbd9d64af1ab3 (patch) | |
| tree | d2a8a25bc7f0f07029ff0cf58a041807c316792d /Doc | |
| parent | 5e7b1c07bc3c6f22f8fbc276c7a1ac0aecfee64a (diff) | |
| download | cpython-ea0b22a167f25deaf170da2c321fbd9d64af1ab3.zip cpython-ea0b22a167f25deaf170da2c321fbd9d64af1ab3.tar.gz cpython-ea0b22a167f25deaf170da2c321fbd9d64af1ab3.tar.bz2 | |
Patch by Quentin Gallet-Gilles: Renaming leftovers for 2.6.
This fixes the omissions of configparser, copyreg, queue and
socketserver renaming.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/modulefinder.rst | 2 | ||||
| -rw-r--r-- | Doc/whatsnew/2.6.rst | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/modulefinder.rst b/Doc/library/modulefinder.rst index a086206..402f5db 100644 --- a/Doc/library/modulefinder.rst +++ b/Doc/library/modulefinder.rst @@ -97,7 +97,7 @@ Sample output (may vary depending on the architecture):: Loaded modules: _types: - copy_reg: _inverted_registry,_slotnames,__all__ + copyreg: _inverted_registry,_slotnames,__all__ sre_compile: isstring,_sre,_optimize_unicode _sre: sre_constants: REPEAT_ONE,makedict,AT_END_LINE diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst index f52dac3..ea2b42b 100644 --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -1937,7 +1937,7 @@ details. used to hold character data. (Contributed by Achim Gaedke; :issue:`1137`.) -* The :mod:`Queue` module now provides queue classes that retrieve entries +* The :mod:`queue` module now provides queue classes that retrieve entries in different orders. The :class:`PriorityQueue` class stores queued items in a heap and retrieves them in priority order, and :class:`LifoQueue` retrieves the most recently added entries first, @@ -2041,7 +2041,7 @@ details. and connects to it using an optional timeout value, returning the connected socket object. -* The base classes in the :mod:`SocketServer` module now support +* The base classes in the :mod:`socketserver` module now support calling a :meth:`handle_timeout` method after a span of inactivity specified by the server's :attr:`timeout` attribute. (Contributed by Michael Pomraning.) The :meth:`serve_forever` method |