Patch by Quentin Gallet-Gilles: Renaming leftovers for 2.6.
This fixes the omissions of configparser, copyreg, queue and
socketserver renaming.
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 @@
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 @@
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 @@
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
diff --git a/Lib/copyreg.py b/Lib/copyreg.py
index db17150..bf8827e 100644
--- a/Lib/copyreg.py
+++ b/Lib/copyreg.py
@@ -13,7 +13,7 @@
def pickle(ob_type, pickle_function, constructor_ob=None):
if type(ob_type) is _ClassType:
- raise TypeError("copy_reg is not intended for use with classes")
+ raise TypeError("copyreg is not intended for use with classes")
if not hasattr(pickle_function, '__call__'):
raise TypeError("reduction functions must be callable")
diff --git a/Lib/pickle.py b/Lib/pickle.py
index 1e91eef..ddb2c81 100644
--- a/Lib/pickle.py
+++ b/Lib/pickle.py
@@ -1,7 +1,7 @@
"""Create portable serialized representations of Python objects.
See module cPickle for a (much) faster implementation.
-See module copy_reg for a mechanism for registering custom picklers.
+See module copyreg for a mechanism for registering custom picklers.
See module pickletools source for extensive comments.
Classes:
diff --git a/Lib/pickletools.py b/Lib/pickletools.py
index ae02a36..623dd16 100644
--- a/Lib/pickletools.py
+++ b/Lib/pickletools.py
@@ -136,7 +136,7 @@
analysis.
To this end, all tests for __safe_for_unpickling__ or for
-copy_reg.safe_constructors are removed from the unpickling code.
+copyreg.safe_constructors are removed from the unpickling code.
References to these variables in the descriptions below are to be seen
as describing unpickling in Python 2.2 and before.
"""
@@ -1525,7 +1525,7 @@
BUILD opcode to apply __setstate__ to that argument.
If type(callable) is not ClassType, REDUCE complains unless the
- callable has been registered with the copy_reg module's
+ callable has been registered with the copyreg module's
safe_constructors dict, or the callable has a magic
'__safe_for_unpickling__' attribute with a true value. I'm not sure
why it does this, but I've sure seen this complaint often enough when
diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index eaa9c25..3b6d966 100644
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -40,7 +40,7 @@
self.check_all("configparser")
self.check_all("Cookie")
self.check_all("MimeWriter")
- self.check_all("Queue")
+ self.check_all("queue")
self.check_all("SimpleHTTPServer")
self.check_all("socketserver")
self.check_all("StringIO")
diff --git a/Misc/cheatsheet b/Misc/cheatsheet
index 61217c4..1ce1996 100644
--- a/Misc/cheatsheet
+++ b/Misc/cheatsheet
@@ -1862,9 +1862,9 @@
colorsys Conversion functions between RGB and other color systems.
commands Tools for executing UNIX commands .
compileall Force "compilation" of all .py files in a directory.
-ConfigParser Configuration file parser (much like windows .ini files)
+configparser Configuration file parser (much like windows .ini files)
copy Generic shallow and deep copying operations.
-copy_reg Helper to provide extensibility for pickle/cPickle.
+copyreg Helper to provide extensibility for pickle/cPickle.
csv Read and write files with comma separated values.
dbhash (g)dbm-compatible interface to bsdhash.hashopen.
dircache Sorted list of files in a dir, using a cache.
@@ -1952,7 +1952,7 @@
pyexpat Interface to the Expay XML parser.
py_compile Routine to "compile" a .py file to a .pyc file.
pyclbr Parse a Python file and retrieve classes and methods.
-Queue A multi-producer, multi-consumer queue.
+queue A multi-producer, multi-consumer queue.
quopri Conversions to/from quoted-printable transport encoding.
rand Don't use unless you want compatibility with C's rand().
random Random variable generators
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 4dfd39e..1138291 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3108,7 +3108,7 @@
!PyList_Check(slotnames))
{
PyErr_SetString(PyExc_TypeError,
- "copy_reg._slotnames didn't return a list or None");
+ "copyreg._slotnames didn't return a list or None");
Py_DECREF(slotnames);
slotnames = NULL;
}