diff options
author | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-11 08:55:36 (GMT) |
---|---|---|
committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-11 08:55:36 (GMT) |
commit | f7fa63dd55e638d300a8d4a148dcedb402fdb750 (patch) | |
tree | 53cc22a0517f95753d4772c11f1c247a7c30fa8b /Lib/os.py | |
parent | 7760008c38b6a88dfdc675d97668763a7c1cacd2 (diff) | |
download | cpython-f7fa63dd55e638d300a8d4a148dcedb402fdb750.zip cpython-f7fa63dd55e638d300a8d4a148dcedb402fdb750.tar.gz cpython-f7fa63dd55e638d300a8d4a148dcedb402fdb750.tar.bz2 |
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 'Lib/os.py')
-rw-r--r-- | Lib/os.py | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -588,7 +588,7 @@ otherwise return -SIG, where SIG is the signal that killed it. """ __all__.extend(["spawnvp", "spawnvpe", "spawnlp", "spawnlpe",]) -import copy_reg as _copy_reg +import copyreg as _copyreg def _make_stat_result(tup, dict): return stat_result(tup, dict) @@ -598,7 +598,7 @@ def _pickle_stat_result(sr): return (_make_stat_result, args) try: - _copy_reg.pickle(stat_result, _pickle_stat_result, _make_stat_result) + _copyreg.pickle(stat_result, _pickle_stat_result, _make_stat_result) except NameError: # stat_result may not exist pass @@ -610,7 +610,7 @@ def _pickle_statvfs_result(sr): return (_make_statvfs_result, args) try: - _copy_reg.pickle(statvfs_result, _pickle_statvfs_result, + _copyreg.pickle(statvfs_result, _pickle_statvfs_result, _make_statvfs_result) except NameError: # statvfs_result may not exist pass |