Emit DeprecationWarning

Author: jacobtylerwalls

Doc/library/urllib.parse.rst

@@ -175,6 +175,11 @@ or on combining URL components into a URL string.
       Characters that affect netloc parsing under NFKC normalization will
       now raise :exc:`ValueError`.
 
+   .. versionchanged:: 3.11
+      Values for `url` and `scheme` other than strings or bytes raise
+      :exc:`TypeError` if true or emit `DeprecationWarning` if false (to be
+      changed to `TypeError` in future versions of Python).
+
 
 .. function:: parse_qs(qs, keep_blank_values=False, strict_parsing=False, encoding='utf-8', errors='replace', max_num_fields=None, separator='&')
 
@@ -264,6 +269,11 @@ or on combining URL components into a URL string.
       query parameter separator. This has been changed to allow only a single
       separator key, with ``&`` as the default separator.
 
+   .. versionchanged:: 3.11
+      Values for `qs` and `separator` other than strings or bytes raise
+      :exc:`TypeError` if true or emit `DeprecationWarning` if false (to be
+      changed to `TypeError` in future versions of Python).
+
 
 .. function:: urlunparse(parts)
 
@@ -273,6 +283,11 @@ or on combining URL components into a URL string.
    unnecessary delimiters (for example, a ``?`` with an empty query; the RFC
    states that these are equivalent).
 
+   .. versionchanged:: 3.11
+      Items in `parts` other than strings or bytes raise
+      :exc:`TypeError` if true or emit `DeprecationWarning` if false (to be
+      changed to `TypeError` in future versions of Python).
+
 
 .. function:: urlsplit(urlstring, scheme='', allow_fragments=True)
 
@@ -337,6 +352,12 @@ or on combining URL components into a URL string.
    .. versionchanged:: 3.10
       ASCII newline and tab characters are stripped from the URL.
 
+   .. versionchanged:: 3.11
+      Values for the url argument and `scheme` other than strings or bytes raise
+      :exc:`TypeError` if true or emit `DeprecationWarning` if false (to be
+      changed to `TypeError` in future versions of Python).
+
+
 .. _WHATWG spec: https://url.spec.whatwg.org/#concept-basic-url-parser
 
 .. function:: urlunsplit(parts)
@@ -347,6 +368,11 @@ or on combining URL components into a URL string.
    URL that was parsed originally had unnecessary delimiters (for example, a ?
    with an empty query; the RFC states that these are equivalent).
 
+   .. versionchanged:: 3.11
+      Items in `parts` other than strings or bytes raise
+      :exc:`TypeError` if true or emit `DeprecationWarning` if false (to be
+      changed to `TypeError` in future versions of Python).
+
 
 .. function:: urljoin(base, url, allow_fragments=True)
 
@@ -381,6 +407,11 @@ or on combining URL components into a URL string.
 
       Behavior updated to match the semantics defined in :rfc:`3986`.
 
+   .. versionchanged:: 3.11
+      Values for `base` and `url` other than strings or bytes raise
+      :exc:`TypeError` if true or emit `DeprecationWarning` if false (to be
+      changed to `TypeError` in future versions of Python).
+
 
 .. function:: urldefrag(url)
 
@@ -406,6 +437,11 @@ or on combining URL components into a URL string.
    .. versionchanged:: 3.2
       Result is a structured object rather than a simple 2-tuple.
 
+   .. versionchanged:: 3.11
+      Values other than strings or bytes raise
+      :exc:`TypeError` if true or emit `DeprecationWarning` if false (to be
+      changed to `TypeError` in future versions of Python).
+
 .. function:: unwrap(url)
 
    Extract the url from a wrapped URL (that is, a string formatted as

Lib/test/test_urlparse.py

@@ -847,47 +847,11 @@ def test_mixed_types_rejected(self):
         with self.assertRaisesRegex(TypeError, "Cannot mix str"):
             urllib.parse.urljoin(b"http://python.org", "http://python.org")
 
-    def test_forbidden_types(self):
-        with self.assertRaisesRegex(
-                TypeError,
-                "Expected a string or bytes object: got <class 'list'>"):
-            urllib.parse.urljoin('http://www.python.org', [])
-        with self.assertRaisesRegex(
-                TypeError,
-                "Expected a string or bytes object: got <class 'list'>"):
-            urllib.parse.urljoin([], b'docs')
-        with self.assertRaisesRegex(
-                TypeError,
-                "Expected a string or bytes object: got <class 'NoneType'>"):
-            urllib.parse.urlparse(b'www.python.org', None)
-        with self.assertRaisesRegex(
-                TypeError,
-                "Expected a string or bytes object: got <class 'dict'>"):
-            urllib.parse.urlparse({}, '')
-        with self.assertRaisesRegex(
-                TypeError,
-                "Expected a string or bytes object: got <class 'int'>"):
-            urllib.parse.urlsplit(0, 'http')
-        with self.assertRaisesRegex(
-                TypeError,
-                "Expected a string or bytes object: got <class 'NoneType'>"):
-            urllib.parse.urlsplit('http://www.python.org', None)
-        with self.assertRaisesRegex(
-                TypeError,
-                "Expected a string or bytes object: got <class 'tuple'>"):
-            urllib.parse.urldefrag(())
-        with self.assertRaisesRegex(
-                TypeError,
-                "Expected a string or bytes object: got <class 'NoneType'>"):
-            urllib.parse.urlunparse([None, './Python','x-newscheme://foo.com/stuff','x://y','x:/y','x:/','/',])
-        with self.assertRaisesRegex(
-                TypeError,
-                "Expected a string or bytes object: got <class 'int'>"):
-            urllib.parse.urlunsplit(['http', 0, '', '', ''])
-        with self.assertRaisesRegex(
-                TypeError,
-                "Expected a string or bytes object: got <class 'NoneType'>"):
-            urllib.parse.parse_qsl(None, encoding='latin-1')
+    def test_non_string_true_values_rejected(self):
+        # True values raise informative TypeErrors
+        msg = "Expected a string or bytes object: got <class "
+        with self.assertRaisesRegex(TypeError, msg):
+            urllib.parse.urlsplit(1, b'http')
 
     def _check_result_type(self, str_type):
         num_args = len(str_type._fields)
@@ -1378,6 +1342,32 @@ def test_to_bytes_deprecation(self):
         self.assertEqual(str(cm.warning),
                          'urllib.parse.to_bytes() is deprecated as of 3.8')
 
+    def test_false_value_deprecation(self):
+        pattern = (
+            "Providing false values other than strings or bytes to urllib.parse "
+            "is deprecated: got <class "
+        )
+        with self.assertWarnsRegex(DeprecationWarning, pattern):
+            urllib.parse.urljoin('http://www.python.org', [])
+        with self.assertWarnsRegex(DeprecationWarning, pattern):
+            urllib.parse.urljoin([], b'docs')
+        with self.assertWarnsRegex(DeprecationWarning, pattern):
+            urllib.parse.urlparse(b'www.python.org', None)
+        with self.assertWarnsRegex(DeprecationWarning, pattern):
+            urllib.parse.urlparse({}, '')
+        with self.assertWarnsRegex(DeprecationWarning, pattern):
+            urllib.parse.urlsplit(0, b'http')
+        with self.assertWarnsRegex(DeprecationWarning, pattern):
+            urllib.parse.urlsplit(b'http://www.python.org', None)
+        with self.assertWarnsRegex(DeprecationWarning, pattern):
+            urllib.parse.urldefrag(())
+        with self.assertWarnsRegex(DeprecationWarning, pattern):
+            urllib.parse.urlunparse([None, b'www.python.org', None, None, None, None])
+        with self.assertWarnsRegex(DeprecationWarning, pattern):
+            urllib.parse.urlunsplit(['http', 0, '', '', ''])
+        with self.assertWarnsRegex(DeprecationWarning, pattern):
+            urllib.parse.parse_qsl(None, encoding='latin-1')
+
 
 if __name__ == "__main__":
     unittest.main()

Lib/urllib/parse.py

@@ -114,8 +114,14 @@ def _coerce_args(*args):
     #   - noop for str inputs
     #   - encoding function otherwise
     for arg in args:
-        if not isinstance(arg, (str, bytes, bytearray)):
-            raise TypeError(f'Expected a string or bytes object: got {type(arg)}')
+        if not (isinstance(arg, str) or hasattr(arg, 'decode')):
+            if arg:
+                raise TypeError(f"Expected a string or bytes object: got {type(arg)}")
+            else:
+                warnings.warn(
+                    f"Providing false values other than strings or bytes "
+                    f"to urllib.parse is deprecated: got {type(arg)}",
+                    DeprecationWarning, 3)
     str_input = isinstance(args[0], str)
     for arg in args[1:]:
         # We special-case the empty string to support the

Misc/NEWS.d/next/Library/2021-06-11-20-00-16.bpo-19094.rMRoIL.rst

@@ -1,5 +1,3 @@
-Raised ``TypeError`` when providing anything but a string or bytes
-object to :func:`urllib.parse.urljoin`, :func:`urllib.parse.urlparse`,
-:func:`urllib.parse.urlsplit`, :func:`urllib.parse.urldefrag`, or
-:func:`urllib.parse.parse_qsl`, or when providing the same in an iterable
-passed to :func:`urllib.parse.urlunparse` or :func:`urllib.parse.urlunsplit`.
+Providing anything but a string or bytes object to :mod:`urllib.parse`
+functions expecting strings or bytes now raises :exc:`DeprecationWarning`
+if the value tests false, or :exc:`TypeError` if it tests true.