diff options
| -rw-r--r-- | Lib/test/test_py3kwarn.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 5 | ||||
| -rw-r--r-- | Modules/cPickle.c | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py index d754faa..8cb0be9 100644 --- a/Lib/test/test_py3kwarn.py +++ b/Lib/test/test_py3kwarn.py @@ -336,7 +336,7 @@ class TestStdlibRemovals(unittest.TestCase): 'sunos5' : ('sunaudiodev', 'SUNAUDIODEV'), } optional_modules = ('bsddb185', 'Canvas', 'dl', 'linuxaudiodev', 'imageop', - 'sv', 'cPickle', 'bsddb', 'dbhash') + 'sv', 'bsddb', 'dbhash') def check_removal(self, module_name, optional=False): """Make sure the specified module, when imported, raises a @@ -65,6 +65,11 @@ Core and Builtins Library ------- +- Issue #7092: Remove py3k warning when importing cPickle. 2to3 handles + renaming of `cPickle` to `pickle`. The warning was annoying since there's + no alternative to cPickle if you care about performance. Patch by Florent + Xicluna. + - Issue #7455: Fix possible crash in cPickle on invalid input. Patch by Victor Stinner. diff --git a/Modules/cPickle.c b/Modules/cPickle.c index 7fa7f70..d89e810 100644 --- a/Modules/cPickle.c +++ b/Modules/cPickle.c @@ -5973,12 +5973,6 @@ 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; |