Improve error message wording

Author: jacobtylerwalls

Lib/test/test_urlparse.py

@@ -850,27 +850,27 @@ def test_mixed_types_rejected(self):
     def test_forbidden_types(self):
         with self.assertRaisesRegex(
                 TypeError,
-                "Expected string or bytes: got <class 'list'>"):
+                "Expected a string or bytes object: got <class 'list'>"):
             urllib.parse.urljoin('http://www.python.org', [])
         with self.assertRaisesRegex(
                 TypeError,
-                "Expected string or bytes: got <class 'list'>"):
+                "Expected a string or bytes object: got <class 'list'>"):
             urllib.parse.urljoin([], b'docs')
         with self.assertRaisesRegex(
                 TypeError,
-                "Expected string or bytes: got <class 'NoneType'>"):
+                "Expected a string or bytes object: got <class 'NoneType'>"):
             urllib.parse.urlparse(b'www.python.org', None)
         with self.assertRaisesRegex(
                 TypeError,
-                "Expected string or bytes: got <class 'dict'>"):
+                "Expected a string or bytes object: got <class 'dict'>"):
             urllib.parse.urlparse({}, '')
         with self.assertRaisesRegex(
                 TypeError,
-                "Expected string or bytes: got <class 'int'>"):
+                "Expected a string or bytes object: got <class 'int'>"):
             urllib.parse.urlsplit(0, 'http')
         with self.assertRaisesRegex(
                 TypeError,
-                "Expected string or bytes: got <class 'NoneType'>"):
+                "Expected a string or bytes object: got <class 'NoneType'>"):
             urllib.parse.urlsplit('http://www.python.org', None)
 
     def _check_result_type(self, str_type):

Lib/urllib/parse.py

@@ -384,9 +384,9 @@ def urlparse(url, scheme='', allow_fragments=True):
     Note that % escapes are not expanded.
     """
     if not isinstance(url, (str, bytes, bytearray)):
-        raise TypeError(f'Expected string or bytes: got {type(url)}')
+        raise TypeError(f'Expected a string or bytes object: got {type(url)}')
     if not isinstance(scheme, (str, bytes, bytearray)):
-        raise TypeError(f'Expected string or bytes: got {type(scheme)}')
+        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
@@ -456,9 +456,9 @@ def urlsplit(url, scheme='', allow_fragments=True):
     Note that % escapes are not expanded.
     """
     if not isinstance(url, (str, bytes, bytearray)):
-        raise TypeError(f'Expected string or bytes: got {type(url)}')
+        raise TypeError(f'Expected a string or bytes object: got {type(url)}')
     if not isinstance(scheme, (str, bytes, bytearray)):
-        raise TypeError(f'Expected string or bytes: got {type(scheme)}')
+        raise TypeError(f'Expected a string or bytes object: got {type(scheme)}')
 
     url, scheme, _coerce_result = _coerce_args(url, scheme)
 
@@ -523,9 +523,9 @@ 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 string or bytes: got {type(base)}')
+        raise TypeError(f'Expected a string or bytes object: got {type(base)}')
     if not isinstance(url, (str, bytes, bytearray)):
-        raise TypeError(f'Expected string or bytes: got {type(url)}')
+        raise TypeError(f'Expected a string or bytes object: got {type(url)}')
 
     if not base:
         return url