From 93b821f53b7126c80cb4ac82710219cdb602b912 Mon Sep 17 00:00:00 2001 From: "antoine.pitrou" Date: Fri, 8 Jan 2010 19:20:17 +0000 Subject: [PATCH] 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. git-svn-id: http://svn.python.org/projects/python/trunk@77370 6015fed2-1504-0410-9fe1-9d1591cc4771 --- Lib/test/test_py3kwarn.py | 2 +- Misc/NEWS | 5 +++++ 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 d754faa75e..8cb0be9669 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 diff --git a/Misc/NEWS b/Misc/NEWS index b5151e7e95..97720bc581 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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 7fa7f703d7..d89e8109e8 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; -- 2.11.4.GIT