fixups

Author: jacobtylerwalls

Lib/test/test_urlparse.py

@@ -1257,7 +1257,7 @@ def test_mixed_types_rejected(self):
 
     def test_non_string_true_values_rejected(self):
         # True values raise informative TypeErrors
-        msg = "Expected a string or bytes object: got <class "
+        msg = "Expected a string, bytes, or None: got <class "
         with self.assertRaisesRegex(TypeError, msg):
             urllib.parse.urlsplit(1, b'http')
 
@@ -1998,12 +1998,12 @@ def test_falsey_deprecation(self):
         cases = [
             (urllib.parse.urljoin, ['http://www.python.org', []]),
             (urllib.parse.urljoin, [[], b'docs']),
-            (urllib.parse.urlparse, [b'www.python.org', None]),
+            (urllib.parse.urlparse, [b'www.python.org', {}]),
             (urllib.parse.urlparse, [{}, '']),
             (urllib.parse.urlsplit, [0, b'http']),
-            (urllib.parse.urlsplit, [b'http://www.python.org', None]),
+            (urllib.parse.urlsplit, [b'http://www.python.org', 0]),
             (urllib.parse.urldefrag, [{}]),
-            (urllib.parse.urlunparse, [[None, b'www.python.org', None, None, None, None]]),
+            (urllib.parse.urlunparse, [[None, b'www.python.org', (), (), (), ()]]),
             (urllib.parse.urlunsplit, [['http', 0, '', '', '']]),
         ]
         for callable, args in cases:

Lib/urllib/parse.py

@@ -134,7 +134,7 @@ def _coerce_args(*args):
                     raise TypeError("Cannot mix str and non-str arguments")
             if str_input is False and arg is not None and not hasattr(arg, "decode"):
                 raise TypeError(f"Expected a string, bytes, or None: got {type(arg)}")
-        elif arg not in empty_values:
+        elif arg is not None and arg != "" and arg != b"":
             warnings.warn(
                 f"Providing false values other than empty strings, bytes, or"
                 f"None to urllib.parse is deprecated: got {type(arg)}",