diff options
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/pickletester.py | 7 | ||||
| -rw-r--r-- | Lib/test/test_pickle.py | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py index 57e051c812..d541194703 100644 --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -728,12 +728,6 @@ class AbstractPickleTests(unittest.TestCase): self.assertEqual(y.abc, 666) self.assertEqual(x.__dict__, y.__dict__) -# 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 @@ -745,6 +739,7 @@ class TempAbstractPickleTests(unittest.TestCase): self.assertEqual(x.foo, y.foo) self.assertEqual(x.bar, y.bar) + class MyInt(int): sample = 1 diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py index ac2a59659b..9cfb9b782b 100644 --- a/Lib/test/test_pickle.py +++ b/Lib/test/test_pickle.py @@ -5,11 +5,10 @@ from cStringIO import StringIO from test import test_support 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): +class PickleTests(AbstractPickleTests, AbstractPickleModuleTests): def dumps(self, arg, proto=0, fast=0): # Ignore fast |