Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Added Python 3.0 warning to cPickle.

This commit is contained in:
Alexandre Vassalotti 2008-05-16 19:14:31 +00:00
parent ea0b22a167
commit 3c4971c40e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_py3kwarn.py
View File

@ -155,7 +155,7 @@ class TestStdlibRemovals(unittest.TestCase):
'sunos5' : ('sunaudiodev', 'SUNAUDIODEV'), 'sunos5' : ('sunaudiodev', 'SUNAUDIODEV'),
} }
optional_modules = ('bsddb185', 'Canvas', 'dl', 'linuxaudiodev', 'imageop', optional_modules = ('bsddb185', 'Canvas', 'dl', 'linuxaudiodev', 'imageop',
'sv') 'sv', 'cPickle')
def check_removal(self, module_name, optional=False): def check_removal(self, module_name, optional=False):
"""Make sure the specified module, when imported, raises a """Make sure the specified module, when imported, raises a

6
Modules/cPickle.c
View File

@ -5710,6 +5710,12 @@ initcPickle(void)
PyObject *format_version; PyObject *format_version;
PyObject *compatible_formats; PyObject *compatible_formats;
/* XXX: Should mention that the pickle module will include the C
XXX: optimized implementation automatically. */
if (PyErr_WarnPy3k("the cPickle module has been removed in "
"Python 3.0", 2) < 0)
return;
Py_TYPE(&Picklertype) = &PyType_Type; Py_TYPE(&Picklertype) = &PyType_Type;
Py_TYPE(&Unpicklertype) = &PyType_Type; Py_TYPE(&Unpicklertype) = &PyType_Type;
Py_TYPE(&PdataType) = &PyType_Type; Py_TYPE(&PdataType) = &PyType_Type;