diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-12-01 02:32:32 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-12-01 02:32:32 (GMT) |
| commit | ed3a7d2d601ce1e65b0bacf24676440631158ec8 (patch) | |
| tree | d8e7df73bc7d9aa2c3cfafd4adb9838dffcea230 /Lib/test/test_urlparse.py | |
| parent | f10c400b91e44c5c744f4ddc05d90933cba3a56b (diff) | |
| download | cpython-ed3a7d2d601ce1e65b0bacf24676440631158ec8.zip cpython-ed3a7d2d601ce1e65b0bacf24676440631158ec8.tar.gz cpython-ed3a7d2d601ce1e65b0bacf24676440631158ec8.tar.bz2 | |
#10273: Rename assertRegexpMatches and assertRaisesRegexp to assertRegex and assertRaisesRegex.
Diffstat (limited to 'Lib/test/test_urlparse.py')
| -rw-r--r-- | Lib/test/test_urlparse.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py index e67c2b6..73e4de5 100644 --- a/Lib/test/test_urlparse.py +++ b/Lib/test/test_urlparse.py @@ -629,25 +629,25 @@ class UrlParseTestCase(unittest.TestCase): def test_mixed_types_rejected(self): # Several functions that process either strings or ASCII encoded bytes # accept multiple arguments. Check they reject mixed type input - with self.assertRaisesRegexp(TypeError, "Cannot mix str"): + with self.assertRaisesRegex(TypeError, "Cannot mix str"): urllib.parse.urlparse("www.python.org", b"http") - with self.assertRaisesRegexp(TypeError, "Cannot mix str"): + with self.assertRaisesRegex(TypeError, "Cannot mix str"): urllib.parse.urlparse(b"www.python.org", "http") - with self.assertRaisesRegexp(TypeError, "Cannot mix str"): + with self.assertRaisesRegex(TypeError, "Cannot mix str"): urllib.parse.urlsplit("www.python.org", b"http") - with self.assertRaisesRegexp(TypeError, "Cannot mix str"): + with self.assertRaisesRegex(TypeError, "Cannot mix str"): urllib.parse.urlsplit(b"www.python.org", "http") - with self.assertRaisesRegexp(TypeError, "Cannot mix str"): + with self.assertRaisesRegex(TypeError, "Cannot mix str"): urllib.parse.urlunparse(( b"http", "www.python.org","","","","")) - with self.assertRaisesRegexp(TypeError, "Cannot mix str"): + with self.assertRaisesRegex(TypeError, "Cannot mix str"): urllib.parse.urlunparse(("http", b"www.python.org","","","","")) - with self.assertRaisesRegexp(TypeError, "Cannot mix str"): + with self.assertRaisesRegex(TypeError, "Cannot mix str"): urllib.parse.urlunsplit((b"http", "www.python.org","","","")) - with self.assertRaisesRegexp(TypeError, "Cannot mix str"): + with self.assertRaisesRegex(TypeError, "Cannot mix str"): urllib.parse.urlunsplit(("http", b"www.python.org","","","")) - with self.assertRaisesRegexp(TypeError, "Cannot mix str"): + with self.assertRaisesRegex(TypeError, "Cannot mix str"): urllib.parse.urljoin("http://python.org", b"http://python.org") - with self.assertRaisesRegexp(TypeError, "Cannot mix str"): + with self.assertRaisesRegex(TypeError, "Cannot mix str"): urllib.parse.urljoin(b"http://python.org", "http://python.org") def _check_result_type(self, str_type): |