summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_pickle.py
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2003-01-28 22:34:11 (GMT)
committerTim Peters <tim.peters@gmail.com>2003-01-28 22:34:11 (GMT)
commit47a6b13988a71b0ac0d471168138e31144bf1a32 (patch)
treee02c1e3a49e90dcae563253059f84481331acfed /Lib/test/test_pickle.py
parent4e2491dbb132ec6327c1d3327878ea69bc938c1b (diff)
downloadcpython-47a6b13988a71b0ac0d471168138e31144bf1a32.zip
cpython-47a6b13988a71b0ac0d471168138e31144bf1a32.tar.gz
cpython-47a6b13988a71b0ac0d471168138e31144bf1a32.tar.bz2
Temporary hacks to arrange that the pickle tests relying on protocol 2
only get run by test_pickle.py now (& not by test_cpickle.py). This should be undone when protocol 2 is implemented in cPickle too. test_cpickle should pass again.
Diffstat (limited to 'Lib/test/test_pickle.py')
-rw-r--r--Lib/test/test_pickle.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py
index 24052b5..d30e084 100644
--- a/Lib/test/test_pickle.py
+++ b/Lib/test/test_pickle.py
@@ -1,11 +1,15 @@
import pickle
import unittest
from cStringIO import StringIO
-from test.pickletester import AbstractPickleTests, AbstractPickleModuleTests, \
- AbstractPersistentPicklerTests
+
from test import test_support
-class PickleTests(AbstractPickleTests, AbstractPickleModuleTests):
+from test.pickletester import AbstractPickleTests
+from test.pickletester import TempAbstractPickleTests as XXXTemp
+from test.pickletester import AbstractPickleModuleTests
+from test.pickletester import AbstractPersistentPicklerTests
+
+class PickleTests(AbstractPickleTests, AbstractPickleModuleTests, XXXTemp):
def setUp(self):
self.dumps = pickle.dumps