Issue #15079: make a test applicable to both C and Python versions of the pickle...

Patch by Stefan Mihaila.

diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
index cab0523e351fbf9459f891f68ae699a9944bf008..4d491b0173c3e7c3ad39ac660857067da3ef3e50 100644 (file)
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -707,6 +707,11 @@ class AbstractPickleTests(unittest.TestCase):
     def test_getinitargs(self):
         pass
 
+    def test_pop_empty_stack(self):
+        # Test issue7455
+        s = b'0'
+        self.assertRaises((pickle.UnpicklingError, IndexError), self.loads, s)
+
     def test_metaclass(self):
         a = use_metaclass()
         for proto in protocols:
@@ -1383,9 +1388,6 @@ class AbstractPickleModuleTests(unittest.TestCase):
         # Test issue4298
         s = bytes([0x58, 0, 0, 0, 0x54])
         self.assertRaises(EOFError, pickle.loads, s)
-        # Test issue7455
-        s = b'0'
-        self.assertRaises(pickle.UnpicklingError, pickle.loads, s)
 
 
 class AbstractPersistentPicklerTests(unittest.TestCase):

diff --git a/Misc/ACKS b/Misc/ACKS
index b5cead9bed7f270e55735ec6e7030dac0283c265..514e95dbec941d5d84781f06a988bfa472c8be13 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -630,6 +630,7 @@ Mike Meyer
 Steven Miale
 Trent Mick
 Stan Mihai
+Stefan Mihaila
 Aristotelis Mikropoulos
 Damien Miller
 Chad Miller