diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-04-20 21:59:06 +0300 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-04-20 21:59:06 +0300 |
| commit | ddfaa8813ca98c8b2722aaa9c8e7571647a3de1c (patch) | |
| tree | d98f625aa84b799a7582ae05cfa4de9b8d1dd53e /Lib | |
| parent | 6abf205d3b6d48d5c5c98c2f54354e2ebfb681bb (diff) | |
| parent | 43a58be3533c8cef04bf437d6569a25c18232ee7 (diff) | |
| download | cpython-ddfaa8813ca98c8b2722aaa9c8e7571647a3de1c.tar.gz | |
Merge with 3.2.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/string_tests.py | 14 | ||||
| -rw-r--r-- | Lib/test/test_bytes.py | 14 |
2 files changed, 14 insertions, 14 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) diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py index 6593756bca..5c6238bb68 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -525,19 +525,19 @@ class BaseBytesTest(unittest.TestCase): # issue 11828 b = self.type2test(b'hello') x = self.type2test(b'x') - self.assertRaisesRegexp(TypeError, r'\bfind\b', b.find, + self.assertRaisesRegex(TypeError, r'\bfind\b', b.find, x, None, None, None) - self.assertRaisesRegexp(TypeError, r'\brfind\b', b.rfind, + self.assertRaisesRegex(TypeError, r'\brfind\b', b.rfind, x, None, None, None) - self.assertRaisesRegexp(TypeError, r'\bindex\b', b.index, + self.assertRaisesRegex(TypeError, r'\bindex\b', b.index, x, None, None, None) - self.assertRaisesRegexp(TypeError, r'\brindex\b', b.rindex, + self.assertRaisesRegex(TypeError, r'\brindex\b', b.rindex, x, None, None, None) - self.assertRaisesRegexp(TypeError, r'\bcount\b', b.count, + self.assertRaisesRegex(TypeError, r'\bcount\b', b.count, x, None, None, None) - self.assertRaisesRegexp(TypeError, r'\bstartswith\b', b.startswith, + self.assertRaisesRegex(TypeError, r'\bstartswith\b', b.startswith, x, None, None, None) - self.assertRaisesRegexp(TypeError, r'\bendswith\b', b.endswith, + self.assertRaisesRegex(TypeError, r'\bendswith\b', b.endswith, x, None, None, None) |