diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-01-08 19:21:34 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-01-08 19:21:34 (GMT) |
| commit | 0b074575b737ee31a46c05718110272c2785e47a (patch) | |
| tree | 895b586b61ffa88942a1ec3c64988ea725b80046 /Modules | |
| parent | d3ffdb44c819944a54264b9c3d4017928bceee04 (diff) | |
| download | cpython-0b074575b737ee31a46c05718110272c2785e47a.zip cpython-0b074575b737ee31a46c05718110272c2785e47a.tar.gz cpython-0b074575b737ee31a46c05718110272c2785e47a.tar.bz2 | |
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.
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/cPickle.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Modules/cPickle.c b/Modules/cPickle.c index 331fca2..937329b 100644 --- a/Modules/cPickle.c +++ b/Modules/cPickle.c @@ -5854,12 +5854,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; |