Merge with 3.4

2014-06-20 15:17:01 -04:00 · 2014-06-20 15:17:01 -04:00 · e079147870
parent 49c02b62dd af9eb9628d
commit e079147870
1 changed files with 1 additions and 1 deletions
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@ -1149,7 +1149,7 @@ order (MRO) for bases """
        except (TypeError, UnicodeEncodeError):
            pass
        else:
-            raise TestFailed("[chr(128)] slots not caught")
+            self.fail("[chr(128)] slots not caught")

        # Test leaks
        class Counted(object):