Revert copy_reg -> copyreg rename.
diff --git a/Doc/library/copy.rst b/Doc/library/copy.rst
index ce127a3..89b668d 100644
--- a/Doc/library/copy.rst
+++ b/Doc/library/copy.rst
@@ -63,7 +63,7 @@
Classes can use the same interfaces to control copying that they use to control
pickling. See the description of module :mod:`pickle` for information on these
-methods. The :mod:`copy` module does not use the :mod:`copyreg` registration
+methods. The :mod:`copy` module does not use the :mod:`copy_reg` registration
module.
.. index::
diff --git a/Doc/library/copyreg.rst b/Doc/library/copy_reg.rst
similarity index 81%
rename from Doc/library/copyreg.rst
rename to Doc/library/copy_reg.rst
index 3a3f815..609ded0 100644
--- a/Doc/library/copyreg.rst
+++ b/Doc/library/copy_reg.rst
@@ -1,23 +1,20 @@
-:mod:`copyreg` --- Register :mod:`pickle` support functions
-===========================================================
+:mod:`copy_reg` --- Register :mod:`pickle` support functions
+============================================================
.. module:: copy_reg
- :synopsis: Old name for the copyreg module.
-
-.. module:: copyreg
:synopsis: Register pickle support functions.
.. note::
The :mod:`copy_reg` module has been renamed to :mod:`copyreg` in Python 3.0.
- It is importable under both names in Python 2.6 and the rest of the 2.x
- series.
+ The :term:`2to3` tool will automatically adapt imports when converting your
+ sources to 3.0.
.. index::
module: pickle
module: cPickle
module: copy
-The :mod:`copyreg` module provides support for the :mod:`pickle` and
+The :mod:`copy_reg` module provides support for the :mod:`pickle` and
:mod:`cPickle` modules. The :mod:`copy` module is likely to use this in the
future as well. It provides configuration information about object constructors
which are not classes. Such constructors may be factory functions or class
diff --git a/Doc/library/modulefinder.rst b/Doc/library/modulefinder.rst
index 402f5db..a086206 100644
--- a/Doc/library/modulefinder.rst
+++ b/Doc/library/modulefinder.rst
@@ -97,7 +97,7 @@
Loaded modules:
_types:
- copyreg: _inverted_registry,_slotnames,__all__
+ copy_reg: _inverted_registry,_slotnames,__all__
sre_compile: isstring,_sre,_optimize_unicode
_sre:
sre_constants: REPEAT_ONE,makedict,AT_END_LINE
diff --git a/Doc/library/persistence.rst b/Doc/library/persistence.rst
index 3708d17..78e40f6 100644
--- a/Doc/library/persistence.rst
+++ b/Doc/library/persistence.rst
@@ -19,7 +19,7 @@
.. toctree::
pickle.rst
- copyreg.rst
+ copy_reg.rst
shelve.rst
marshal.rst
anydbm.rst
diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst
index eefa4d3..f197261 100644
--- a/Doc/library/pickle.rst
+++ b/Doc/library/pickle.rst
@@ -535,7 +535,7 @@
and calls :meth:`__reduce__`.
An alternative to implementing a :meth:`__reduce__` method on the object to be
-pickled, is to register the callable with the :mod:`copyreg` module. This
+pickled, is to register the callable with the :mod:`copy_reg` module. This
module provides a way for programs to register "reduction functions" and
constructors for user-defined types. Reduction functions have the same
semantics and interface as the :meth:`__reduce__` method described above, except
@@ -786,7 +786,7 @@
.. seealso::
- Module :mod:`copyreg`
+ Module :mod:`copy_reg`
Pickle interface constructor registration for extension types.
Module :mod:`shelve`