Moved unpickling tests with prepickled data to separate class.
diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py
index c312649..2db7589 100644
--- a/Lib/test/test_pickle.py
+++ b/Lib/test/test_pickle.py
@@ -3,13 +3,15 @@
from test import test_support
-from test.pickletester import (AbstractPickleTests,
+from test.pickletester import (AbstractUnpickleTests,
+ AbstractPickleTests,
AbstractPickleModuleTests,
AbstractPersistentPicklerTests,
AbstractPicklerUnpicklerObjectTests,
BigmemPickleTests)
-class PickleTests(AbstractPickleTests, AbstractPickleModuleTests):
+class PickleTests(AbstractUnpickleTests, AbstractPickleTests,
+ AbstractPickleModuleTests):
def dumps(self, arg, proto=0, fast=0):
# Ignore fast
@@ -22,10 +24,18 @@
module = pickle
error = KeyError
-class PicklerTests(AbstractPickleTests):
+class UnpicklerTests(AbstractUnpickleTests):
error = KeyError
+ def loads(self, buf):
+ f = StringIO(buf)
+ u = pickle.Unpickler(f)
+ return u.load()
+
+
+class PicklerTests(AbstractPickleTests):
+
def dumps(self, arg, proto=0, fast=0):
f = StringIO()
p = pickle.Pickler(f, proto)
@@ -81,6 +91,7 @@
def test_main():
test_support.run_unittest(
PickleTests,
+ UnpicklerTests,
PicklerTests,
PersPicklerTests,
PicklerUnpicklerObjectTests,