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