Index: Lib/test/test_cpickle.py =================================================================== --- Lib/test/test_cpickle.py (revision 76877) +++ Lib/test/test_cpickle.py (working copy) @@ -1,9 +1,12 @@ -import cPickle, unittest +import unittest from cStringIO import StringIO from test.pickletester import AbstractPickleTests, AbstractPickleModuleTests from test.pickletester import AbstractPicklerUnpicklerObjectTests from test import test_support +# Silence Py3k warning +from test.pickletester import cPickle + class cPickleTests(AbstractPickleTests, AbstractPickleModuleTests): def setUp(self): Index: Lib/test/pickletester.py =================================================================== --- Lib/test/pickletester.py (revision 76877) +++ Lib/test/pickletester.py (working copy) @@ -1,6 +1,5 @@ import unittest import pickle -import cPickle import StringIO import cStringIO import pickletools @@ -8,6 +7,16 @@ from test.test_support import TestFailed, have_unicode, TESTFN +# Silence Py3k warning while importing cPickle +try: + from test.test_support import import_module +except ImportError: + # This is needed to support Python 2.4 (see comment below) + import cPickle +else: + cPickle = import_module('cPickle', deprecated=True) + + # Tests that try a number of pickle protocols should have a # for proto in protocols: # kind of outer loop. Index: Lib/test/test_xpickle.py =================================================================== --- Lib/test/test_xpickle.py (revision 76877) +++ Lib/test/test_xpickle.py (working copy) @@ -5,7 +5,6 @@ # previous version of Python by bouncing pickled objects through Python 2.4 # and Python 2.5 running this file. -import cPickle import os import os.path import pickle @@ -25,11 +24,13 @@ mod_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "pickletester.py")) pickletester = types.ModuleType("test.pickletester") -execfile(mod_path, pickletester.__dict__, pickletester.__dict__) +exec compile(open(mod_path).read(), mod_path, 'exec') in pickletester.__dict__ AbstractPickleTests = pickletester.AbstractPickleTests if pickletester.__name__ in sys.modules: raise RuntimeError("Did not expect to find test.pickletester loaded") sys.modules[pickletester.__name__] = pickletester +# Silence Py3k warning +cPickle = pickletester.cPickle class DumpCPickle_LoadPickle(AbstractPickleTests):