diff options
| author | Yury Selivanov <yselivanov@sprymix.com> | 2015-07-03 01:10:11 -0400 |
|---|---|---|
| committer | Yury Selivanov <yselivanov@sprymix.com> | 2015-07-03 01:10:11 -0400 |
| commit | bb215e23004af8e8105fae4e132a63b0c25ea47c (patch) | |
| tree | 1e0023f5f39b23e58178ffeb992ac5e2264ff1e9 /Lib/test/test_descr.py | |
| parent | 1c5e5a89b4bc1a7b9dbd0375fbd76dfdadcb8605 (diff) | |
| parent | f488fb422a641aa7c38eb63c09f459e4baff7bc4 (diff) | |
| download | cpython-git-bb215e23004af8e8105fae4e132a63b0c25ea47c.tar.gz | |
Merge 3.5 (Issue #19235)
Diffstat (limited to 'Lib/test/test_descr.py')
| -rw-r--r-- | Lib/test/test_descr.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index 80a526d78c..0ef1a31e0f 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -3342,7 +3342,7 @@ order (MRO) for bases """ A.__call__ = A() try: A()() - except RuntimeError: + except RecursionError: pass else: self.fail("Recursion limit should have been reached for __call__()") @@ -4317,8 +4317,8 @@ order (MRO) for bases """ pass Foo.__repr__ = Foo.__str__ foo = Foo() - self.assertRaises(RuntimeError, str, foo) - self.assertRaises(RuntimeError, repr, foo) + self.assertRaises(RecursionError, str, foo) + self.assertRaises(RecursionError, repr, foo) def test_mixing_slot_wrappers(self): class X(dict): |