From af92842bf988ec3b65fad4b2ab2f0f84c7763c94 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Wed, 20 Apr 2011 21:56:21 +0300 Subject: [PATCH] Use non-deprecated method name. --- Lib/test/string_tests.py | 14 +++++++------- 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 24a4a57e59d..fca38c3ea06 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 4e33a42b2b2..d074758c667 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -523,19 +523,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)