changeset:   98689:df33dbbef7bb
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Sun Oct 11 17:52:09 2015 +0300
files:       Lib/test/test_descr.py
description:
Issue #24164: Fixed test_descr: __getnewargs_ex__ now is supported in protocols 2 and 3.


diff -r 6f4dd9bc1f20 -r df33dbbef7bb Lib/test/test_descr.py
--- a/Lib/test/test_descr.py	Sun Oct 11 17:48:51 2015 +0300
+++ b/Lib/test/test_descr.py	Sun Oct 11 17:52:09 2015 +0300
@@ -4738,11 +4738,8 @@
                 return (args, kwargs)
         obj = C3()
         for proto in protocols:
-            if proto >= 4:
+            if proto >= 2:
                 self._check_reduce(proto, obj, args, kwargs)
-            elif proto >= 2:
-                with self.assertRaises(ValueError):
-                    obj.__reduce_ex__(proto)
 
         class C4:
             def __getnewargs_ex__(self):
@@ -5061,10 +5058,6 @@
                 kwargs = getattr(cls, 'KWARGS', {})
                 obj = cls(*cls.ARGS, **kwargs)
                 proto = pickle_copier.proto
-                if 2 <= proto < 4 and hasattr(cls, '__getnewargs_ex__'):
-                    with self.assertRaises(ValueError):
-                        pickle_copier.dumps(obj, proto)
-                    continue
                 objcopy = pickle_copier.copy(obj)
                 self._assert_is_copy(obj, objcopy)
                 # For test classes that supports this, make sure we didn't go