Merge with 3.4

e0791478 · Terry Jan Reedy · 49c02b62 · af9eb962 · e0791478
Commit e0791478 authored Jun 20, 2014 by Terry Jan Reedy
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Lib/test/test_descr.py Lib/test/test_descr.py +1 -1

No files found.
--- 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):