[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

[terry.reedy]

http://hg.python.org/cpython/rev/b7f2d30e93a8
changeset:   91292:b7f2d30e93a8
parent:      91290:c32fc8ccbf30
parent:      91291:ec0aae4df38b
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Fri Jun 20 15:17:01 2014 -0400
summary:
  Merge with 3.4

files:
  Lib/test/test_descr.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -1149,7 +1149,7 @@
         except (TypeError, UnicodeEncodeError):
             pass
         else:
-            raise TestFailed("[chr(128)] slots not caught")
+            self.fail("[chr(128)] slots not caught")
 
         # Test leaks
         class Counted(object):

-- 
Repository URL: http://hg.python.org/cpython