summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-06-20 19:17:01 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-06-20 19:17:01 (GMT)
commite079147870a44eb3ca54aff5222d655175fb912c (patch)
tree43f2da247995b17a5c1f04033637fa53b6078048
parent49c02b62ddc4e2aad10ae3a19e257bc76e374658 (diff)
parentaf9eb9628d833c8096e4438a48655ed07996137a (diff)
downloadcpython-e079147870a44eb3ca54aff5222d655175fb912c.zip
cpython-e079147870a44eb3ca54aff5222d655175fb912c.tar.gz
cpython-e079147870a44eb3ca54aff5222d655175fb912c.tar.bz2
Merge with 3.4
-rw-r--r--Lib/test/test_descr.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index e65edb2..634ba7e 100644
--- 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):