diff options
| author | Jesus Cea <jcea@jcea.es> | 2011-04-20 21:10:20 +0200 |
|---|---|---|
| committer | Jesus Cea <jcea@jcea.es> | 2011-04-20 21:10:20 +0200 |
| commit | db26dff560c5a5364676b3f0bf43814108d655af (patch) | |
| tree | 9a66255056b86652f7ed8635c03bb82711d86867 /Lib/test/string_tests.py | |
| parent | ec81d4124283001e4fa9bd77d85c0c4c9694697f (diff) | |
| parent | af92842bf988ec3b65fad4b2ab2f0f84c7763c94 (diff) | |
| download | cpython-git-db26dff560c5a5364676b3f0bf43814108d655af.tar.gz | |
heads merging
Diffstat (limited to 'Lib/test/string_tests.py')
| -rw-r--r-- | Lib/test/string_tests.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py index 24a4a57e59..fca38c3ea0 100644 --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -1225,19 +1225,19 @@ class MixinStrUnicodeUserStringTest: # issue 11828 s = 'hello' x = 'x' - self.assertRaisesRegexp(TypeError, r'^find\(', s.find, + self.assertRaisesRegex(TypeError, r'^find\(', s.find, x, None, None, None) - self.assertRaisesRegexp(TypeError, r'^rfind\(', s.rfind, + self.assertRaisesRegex(TypeError, r'^rfind\(', s.rfind, x, None, None, None) - self.assertRaisesRegexp(TypeError, r'^index\(', s.index, + self.assertRaisesRegex(TypeError, r'^index\(', s.index, x, None, None, None) - self.assertRaisesRegexp(TypeError, r'^rindex\(', s.rindex, + self.assertRaisesRegex(TypeError, r'^rindex\(', s.rindex, x, None, None, None) - self.assertRaisesRegexp(TypeError, r'^count\(', s.count, + self.assertRaisesRegex(TypeError, r'^count\(', s.count, x, None, None, None) - self.assertRaisesRegexp(TypeError, r'^startswith\(', s.startswith, + self.assertRaisesRegex(TypeError, r'^startswith\(', s.startswith, x, None, None, None) - self.assertRaisesRegexp(TypeError, r'^endswith\(', s.endswith, + self.assertRaisesRegex(TypeError, r'^endswith\(', s.endswith, x, None, None, None) |