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

Merged revisions 77370 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77370 | antoine.pitrou | 2010-01-08 20:20:17 +0100 (ven., 08 janv. 2010) | 5 lines

  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.
........
This commit is contained in:
Antoine Pitrou 2010-01-08 19:21:34 +00:00
parent d3ffdb44c8
commit 0b074575b7
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_py3kwarn.py
View File

@ -333,7 +333,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', 'cPickle', 'bsddb', 'dbhash') 'sv', 'bsddb', 'dbhash')
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

5
Misc/NEWS
View File

@ -48,6 +48,11 @@ Core and Builtins
Library 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 - Issue #7455: Fix possible crash in cPickle on invalid input. Patch by
Victor Stinner. Victor Stinner.

6
Modules/cPickle.c
View File

@ -5854,12 +5854,6 @@ 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;