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/test_bytes.py | |
parent | ec81d4124283001e4fa9bd77d85c0c4c9694697f (diff) | |
parent | af92842bf988ec3b65fad4b2ab2f0f84c7763c94 (diff) | |
download | cpython-git-db26dff560c5a5364676b3f0bf43814108d655af.tar.gz |
heads merging
Diffstat (limited to 'Lib/test/test_bytes.py')
-rw-r--r-- | Lib/test/test_bytes.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py index 4e33a42b2b..d074758c66 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) |