From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 8 Jan 2010 19:21:34 +0000 (+0000)
Subject: Merged revisions 77370 via svnmerge from
X-Git-Tag: v2.6.5rc1~189
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b074575b737ee31a46c05718110272c2785e47a;p=python

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.
........
---

diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 55b327eaa9..077941a79b 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -333,7 +333,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 85faf59415..00082bc906 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -48,6 +48,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 331fca2f7c..937329b6ac 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;