From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 30 Dec 2015 18:59:32 +0000 (+0200)
Subject: Make catched exceptions more specific and correct a comment.
X-Git-Tag: v2.7.12rc1~320
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff41d456bcbb3a6122513b4c414bbb32ac0a1223;p=thirdparty%2FPython%2Fcpython.git

Make catched exceptions more specific and correct a comment.
---

diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
index 78e59435aaa6..635c5af0317a 100644
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -1373,15 +1373,16 @@ class AbstractPickleTests(unittest.TestCase):
                 # 5th item is not an iterator
                 return dict, (), None, None, []
 
-        # Protocol 0 is less strict and also accept iterables.
+        # Protocol 0 in Python implementation is less strict and also accepts
+        # iterables.
         for proto in protocols:
             try:
                 self.dumps(C(), proto)
-            except (AttributeError, pickle.PickleError, cPickle.PickleError):
+            except (AttributeError, pickle.PicklingError, cPickle.PicklingError):
                 pass
             try:
                 self.dumps(D(), proto)
-            except (AttributeError, pickle.PickleError, cPickle.PickleError):
+            except (AttributeError, pickle.PicklingError, cPickle.PicklingError):
                 pass
 
     def test_many_puts_and_gets(self):