From 47a6b13988a71b0ac0d471168138e31144bf1a32 Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Tue, 28 Jan 2003 22:34:11 +0000 Subject: 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. --- Lib/test/pickletester.py | 6 ++++++ Lib/test/test_pickle.py | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py index 36b3702..1736c12 100644 --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -324,6 +324,12 @@ class AbstractPickleTests(unittest.TestCase): ## print ## pickletools.dis(s) +# XXX Temporary hack, so long as the C implementation of pickle protocol +# XXX 2 isn't ready. When it is, move the methods in TempAbstractPickleTests +# XXX into AbstractPickleTests above, and get rid of TempAbstractPickleTests +# XXX along with the references to it in test_pickle.py. +class TempAbstractPickleTests(unittest.TestCase): + def test_newobj_list_slots(self): x = SlotList([1, 2, 3]) x.foo = 42 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 -- cgit v0.12