Move check to _coerce_args()

This extends the solution to urldefrag(), urlunparse(), urlunsplit(), and parse_qsl()

Author: jacobtylerwalls

Lib/test/test_urlparse.py

@@ -872,6 +872,22 @@ def test_forbidden_types(self):
                 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 _check_result_type(self, str_type):
         num_args = len(str_type._fields)

Lib/urllib/parse.py

@@ -113,6 +113,9 @@ def _coerce_args(*args):
     # an appropriate result coercion function
     #   - 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)}')
     str_input = isinstance(args[0], str)
     for arg in args[1:]:
         # We special-case the empty string to support the
@@ -383,10 +386,6 @@ def urlparse(url, scheme='', allow_fragments=True):
 
     Note that % escapes are not expanded.
     """
-    if not isinstance(url, (str, bytes, bytearray)):
-        raise TypeError(f'Expected a string or bytes object: got {type(url)}')
-    if not isinstance(scheme, (str, bytes, bytearray)):
-        raise TypeError(f'Expected a string or bytes object: got {type(scheme)}')
     url, scheme, _coerce_result = _coerce_args(url, scheme)
     splitresult = urlsplit(url, scheme, allow_fragments)
     scheme, netloc, url, query, fragment = splitresult
@@ -455,10 +454,6 @@ def urlsplit(url, scheme='', allow_fragments=True):
 
     Note that % escapes are not expanded.
     """
-    if not isinstance(url, (str, bytes, bytearray)):
-        raise TypeError(f'Expected a string or bytes object: got {type(url)}')
-    if not isinstance(scheme, (str, bytes, bytearray)):
-        raise TypeError(f'Expected a string or bytes object: got {type(scheme)}')
 
     url, scheme, _coerce_result = _coerce_args(url, scheme)
 
@@ -522,17 +517,12 @@ def urlunsplit(components):
 def urljoin(base, url, allow_fragments=True):
     """Join a base URL and a possibly relative URL to form an absolute
     interpretation of the latter."""
-    if not isinstance(base, (str, bytes, bytearray)):
-        raise TypeError(f'Expected a string or bytes object: got {type(base)}')
-    if not isinstance(url, (str, bytes, bytearray)):
-        raise TypeError(f'Expected a string or bytes object: got {type(url)}')
-
+    base, url, _coerce_result = _coerce_args(base, url)
     if not base:
-        return url
+        return _coerce_result(url)
     if not url:
-        return base
+        return _coerce_result(base)
 
-    base, url, _coerce_result = _coerce_args(base, url)
     bscheme, bnetloc, bpath, bparams, bquery, bfragment = \
             urlparse(base, '', allow_fragments)
     scheme, netloc, path, params, query, fragment = \