diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-04-20 18:59:06 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-04-20 18:59:06 (GMT) |
| commit | 5020e000c56a39930816df8d0e5742a113392f8c (patch) | |
| tree | 1538029282ebe254481484cd708cbb9dee98d29d /Lib | |
| parent | 32f4db3175a88f21a90791eafe01cac6d763877d (diff) | |
| parent | af92842bf988ec3b65fad4b2ab2f0f84c7763c94 (diff) | |
| download | cpython-5020e000c56a39930816df8d0e5742a113392f8c.zip cpython-5020e000c56a39930816df8d0e5742a113392f8c.tar.gz cpython-5020e000c56a39930816df8d0e5742a113392f8c.tar.bz2 | |
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 24a4a57..fca38c3 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 6593756..5c6238b 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) |