diff options
| -rw-r--r-- | Lib/test/test_py3kwarn.py | 2 | ||||
| -rw-r--r-- | Modules/cPickle.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py index c6160dac97..2c8f509e60 100644 --- a/Lib/test/test_py3kwarn.py +++ b/Lib/test/test_py3kwarn.py @@ -155,7 +155,7 @@ class TestStdlibRemovals(unittest.TestCase): 'sunos5' : ('sunaudiodev', 'SUNAUDIODEV'), } optional_modules = ('bsddb185', 'Canvas', 'dl', 'linuxaudiodev', 'imageop', - 'sv') + 'sv', 'cPickle') def check_removal(self, module_name, optional=False): """Make sure the specified module, when imported, raises a diff --git a/Modules/cPickle.c b/Modules/cPickle.c index 1dd35be645..06726eed9c 100644 --- a/Modules/cPickle.c +++ b/Modules/cPickle.c @@ -5710,6 +5710,12 @@ initcPickle(void) PyObject *format_version; 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(&Unpicklertype) = &PyType_Type; Py_TYPE(&PdataType) = &PyType_Type; |