summaryrefslogtreecommitdiff
path: root/Lib/test/test_py3kwarn.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-01-08 19:21:34 +0000
committerAntoine Pitrou <solipsis@pitrou.net>2010-01-08 19:21:34 +0000
commit0b074575b737ee31a46c05718110272c2785e47a (patch)
tree895b586b61ffa88942a1ec3c64988ea725b80046 /Lib/test/test_py3kwarn.py
parentd3ffdb44c819944a54264b9c3d4017928bceee04 (diff)
downloadcpython-git-0b074575b737ee31a46c05718110272c2785e47a.tar.gz
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 'Lib/test/test_py3kwarn.py')
-rw-r--r--Lib/test/test_py3kwarn.py2
1 files changed, 1 insertions, 1 deletions
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