Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2014-06-20 15:17:01 -04:00
commit e079147870

View file

@ -1149,7 +1149,7 @@ order (MRO) for bases """
except (TypeError, UnicodeEncodeError): except (TypeError, UnicodeEncodeError):
pass pass
else: else:
raise TestFailed("[chr(128)] slots not caught") self.fail("[chr(128)] slots not caught")
# Test leaks # Test leaks
class Counted(object): class Counted(object):