diff options
| author | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-11 08:55:36 +0000 |
|---|---|---|
| committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-11 08:55:36 +0000 |
| commit | f7fa63dd55e638d300a8d4a148dcedb402fdb750 (patch) | |
| tree | 53cc22a0517f95753d4772c11f1c247a7c30fa8b /Doc | |
| parent | 7760008c38b6a88dfdc675d97668763a7c1cacd2 (diff) | |
| download | cpython-git-f7fa63dd55e638d300a8d4a148dcedb402fdb750.tar.gz | |
Rename copy_reg module to copyreg.
Updated documentation.
Merged revisions 63042 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63042 | alexandre.vassalotti | 2008-05-11 04:25:28 -0400 (Sun, 11 May 2008) | 5 lines
Added module stub for copy_reg renaming in 3.0.
Renamed copy_reg to copyreg in the standard library, to avoid
spurious warnings and ease later merging to py3k branch. Public
documentation remains intact.
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/copy.rst | 2 | ||||
| -rw-r--r-- | Doc/library/copyreg.rst (renamed from Doc/library/copy_reg.rst) | 6 | ||||
| -rw-r--r-- | Doc/library/modulefinder.rst | 2 | ||||
| -rw-r--r-- | Doc/library/persistence.rst | 2 | ||||
| -rw-r--r-- | Doc/library/pickle.rst | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/Doc/library/copy.rst b/Doc/library/copy.rst index 485cfc5da9..554801f2e5 100644 --- a/Doc/library/copy.rst +++ b/Doc/library/copy.rst @@ -60,7 +60,7 @@ of lists by assigning a slice of the entire list, for example, 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:`copy_reg` registration +methods. The :mod:`copy` module does not use the :mod:`copyreg` registration module. .. index:: diff --git a/Doc/library/copy_reg.rst b/Doc/library/copyreg.rst index 2e85be7f19..dd97ade564 100644 --- a/Doc/library/copy_reg.rst +++ b/Doc/library/copyreg.rst @@ -1,8 +1,8 @@ -:mod:`copy_reg` --- Register :mod:`pickle` support functions +:mod:`copyreg` --- Register :mod:`pickle` support functions ============================================================ -.. module:: copy_reg +.. module:: copyreg :synopsis: Register pickle support functions. @@ -11,7 +11,7 @@ module: cPickle module: copy -The :mod:`copy_reg` module provides support for the :mod:`pickle` and +The :mod:`copyreg` 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 7a289f4040..13ea11d28a 100644 --- a/Doc/library/modulefinder.rst +++ b/Doc/library/modulefinder.rst @@ -95,7 +95,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/library/persistence.rst b/Doc/library/persistence.rst index 78e40f6446..3708d17fb8 100644 --- a/Doc/library/persistence.rst +++ b/Doc/library/persistence.rst @@ -19,7 +19,7 @@ The list of modules described in this chapter is: .. toctree:: pickle.rst - copy_reg.rst + copyreg.rst shelve.rst marshal.rst anydbm.rst diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst index ff3d918779..c3b9c8fe49 100644 --- a/Doc/library/pickle.rst +++ b/Doc/library/pickle.rst @@ -524,7 +524,7 @@ not :meth:`__reduce_ex__`, the :meth:`__reduce_ex__` implementation detects this 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:`copy_reg` module. This +pickled, is to register the callable with the :mod:`copyreg` 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 @@ -775,7 +775,7 @@ the same process or a new process. :: .. seealso:: - Module :mod:`copy_reg` + Module :mod:`copyreg` Pickle interface constructor registration for extension types. Module :mod:`shelve` |
