gh-105708: 'V' could be case insensitive for IPvFuture hostnames (#105709)

* gh-105708: 'V' could be case insensitive for IPvFuture hostnames

* gh-105708: 'V' could be case insensitive for IPvFuture hostnames & checking empty hostnames

* 📜🤖 Added by blurb_it.

* Fix the Merge changing \z to \Z.

* Fixed the News Entry.

* Fix the lint.

---------

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
Co-authored-by: Senthil Kumaran <senthil@python.org>

diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
index 8e4da0e0f09919135839707e96442fe80c62073a..a5b7966c7780e9e6fce654a111d96bbcaa95e469 100644 (file)
--- a/Lib/test/test_urlparse.py
+++ b/Lib/test/test_urlparse.py
@@ -1653,15 +1653,20 @@ class UrlParseTestCase(unittest.TestCase):
         self.assertEqual(p1.username, 'user')
         self.assertEqual(p1.path, '/path')
         self.assertEqual(p1.port, 1234)
-        p2 = urllib.parse.urlsplit('scheme://user@[0439:23af:2309::fae7%test]/path?query')
-        self.assertEqual(p2.hostname, '0439:23af:2309::fae7%test')
+        p2 = urllib.parse.urlsplit('scheme://user@[V6a.ip]:1234/path?query')
+        self.assertEqual(p2.hostname, 'v6a.ip')
         self.assertEqual(p2.username, 'user')
         self.assertEqual(p2.path, '/path')
-        self.assertIs(p2.port, None)
-        p3 = urllib.parse.urlsplit('scheme://user@[0439:23af:2309::fae7:1234:192.0.2.146%test]/path?query')
-        self.assertEqual(p3.hostname, '0439:23af:2309::fae7:1234:192.0.2.146%test')
+        self.assertEqual(p2.port, 1234)
+        p3 = urllib.parse.urlsplit('scheme://user@[0439:23af:2309::fae7%test]/path?query')
+        self.assertEqual(p3.hostname, '0439:23af:2309::fae7%test')
         self.assertEqual(p3.username, 'user')
         self.assertEqual(p3.path, '/path')
+        self.assertIs(p3.port, None)
+        p4 = urllib.parse.urlsplit('scheme://user@[0439:23af:2309::fae7:1234:192.0.2.146%test]/path?query')
+        self.assertEqual(p4.hostname, '0439:23af:2309::fae7:1234:192.0.2.146%test')
+        self.assertEqual(p4.username, 'user')
+        self.assertEqual(p4.path, '/path')
 
     def test_port_casting_failure_message(self):
         message = "Port could not be cast to integer value as 'oracle'"

diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index 82b95adbdc283efc7e1910426502bbdb5105104e..4247b9a4b07fa3f8e10eb9f139039c866162ede0 100644 (file)
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -544,8 +544,8 @@ def _check_bracketed_netloc(netloc):
 # Valid bracketed hosts are defined in
 # https://www.rfc-editor.org/rfc/rfc3986#page-49 and https://url.spec.whatwg.org/
 def _check_bracketed_host(hostname):
-    if hostname.startswith('v'):
-        if not re.match(r"\Av[a-fA-F0-9]+\..+\z", hostname):
+    if hostname.startswith(('v', 'V')):
+        if not re.match(r"\A[vV][a-fA-F0-9]+\..+\z", hostname):
             raise ValueError(f"IPvFuture address is invalid")
     else:
         ip = ipaddress.ip_address(hostname) # Throws Value Error if not IPv6 or IPv4

diff --git a/Misc/NEWS.d/next/Library/2023-06-12-21-31-02.gh-issue-105708.5fFwP8.rst b/Misc/NEWS.d/next/Library/2023-06-12-21-31-02.gh-issue-105708.5fFwP8.rst
new file mode 100644 (file)
index 0000000..79289c1
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-06-12-21-31-02.gh-issue-105708.5fFwP8.rst
@@ -0,0 +1 @@
+Accept an uppercase V prefix in IPvFuture addresses in :func:`urllib.parse.urlsplit`.