[Python-checkins] cpython (3.2): Issue #15079: make a test applicable to both C and Python versions of the

[antoine.pitrou]

http://hg.python.org/cpython/rev/5881a58c5425
changeset:   77811:5881a58c5425
branch:      3.2
parent:      77809:76f2b99f3568
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Tue Jun 26 23:04:48 2012 +0200
summary:
  Issue #15079: make a test applicable to both C and Python versions of the pickle module.
Patch by Stefan Mihaila.

files:
  Lib/test/pickletester.py |  8 +++++---
  Misc/ACKS                |  1 +
  2 files changed, 6 insertions(+), 3 deletions(-)


diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -707,6 +707,11 @@
     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 @@
         # 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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -630,6 +630,7 @@
 Steven Miale
 Trent Mick
 Stan Mihai
+Stefan Mihaila
 Aristotelis Mikropoulos
 Damien Miller
 Chad Miller

-- 
Repository URL: http://hg.python.org/cpython