diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-09-28 16:57:22 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-09-28 16:57:22 (GMT) |
| commit | a2f93885b07bd3e78d803e83a4a8d893273e6642 (patch) | |
| tree | b905c9a223a4dddcbecc7405e4010d7f2aaec97b /Lib/test/test_userstring.py | |
| parent | c081262be6ceed935f56e9d21a9cefe02097223e (diff) | |
| parent | c31f12d196455e916fcbcffc2cc2a3329abe70ed (diff) | |
| download | cpython-a2f93885b07bd3e78d803e83a4a8d893273e6642.zip cpython-a2f93885b07bd3e78d803e83a4a8d893273e6642.tar.gz cpython-a2f93885b07bd3e78d803e83a4a8d893273e6642.tar.bz2 | |
merge 3.4 (#22379)
Diffstat (limited to 'Lib/test/test_userstring.py')
| -rw-r--r-- | Lib/test/test_userstring.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Lib/test/test_userstring.py b/Lib/test/test_userstring.py index 34c629c..9bc8edd 100644 --- a/Lib/test/test_userstring.py +++ b/Lib/test/test_userstring.py @@ -28,14 +28,12 @@ class UserStringTest( realresult ) - def checkraises(self, exc, object, methodname, *args): - object = self.fixtype(object) + def checkraises(self, exc, obj, methodname, *args): + obj = self.fixtype(obj) # we don't fix the arguments, because UserString can't cope with it - self.assertRaises( - exc, - getattr(object, methodname), - *args - ) + with self.assertRaises(exc) as cm: + getattr(obj, methodname)(*args) + self.assertNotEqual(str(cm.exception), '') def checkcall(self, object, methodname, *args): object = self.fixtype(object) |