Fixed ipv6 url replace error and tests type error

Author: abersheeran

baize/datastructures.py

@@ -300,11 +300,18 @@ def replace(self, **kwargs: typing.Any) -> "URL":
             or "hostname" in kwargs
             or "port" in kwargs
         ):
-            hostname = kwargs.pop("hostname", self.hostname)
+            hostname = kwargs.pop("hostname", None)
             port = kwargs.pop("port", self.port)
             username = kwargs.pop("username", self.username)
             password = kwargs.pop("password", self.password)
 
+            if hostname is None:
+                netloc = self.netloc
+                _, _, hostname = netloc.rpartition("@")
+
+                if hostname[-1] != "]":
+                    hostname = hostname.rsplit(":", 1)[0]
+
             netloc = hostname
             if port is not None:
                 netloc += f":{port}"

tests/test_datastructures.py

@@ -1,4 +1,3 @@
-import io
 import os
 import tempfile
 
@@ -45,6 +44,24 @@ def test_url():
     new = URL(**u.components._asdict())
     assert new == u
 
+    ipv6_url = URL("https://[fe::2]:12345")
+    new = ipv6_url.replace(port=8080)
+    assert new == "https://[fe::2]:8080"
+
+    new = ipv6_url.replace(username="username", password="password")
+    assert new == "https://username:password@[fe::2]:12345"
+    assert new.netloc == "username:password@[fe::2]:12345"
+
+    ipv6_url = URL("https://[fe::2]")
+    new = ipv6_url.replace(port=123)
+    assert new == "https://[fe::2]:123"
+
+    url = URL("http://u:p@host/")
+    assert url.replace(hostname="bar") == URL("http://u:p@bar/")
+
+    url = URL("http://u:p@host:80")
+    assert url.replace(port=88) == URL("http://u:p@host:88")
+
 
 def test_url_query_params():
     u = URL("https://example.org/path/?page=3")
@@ -198,7 +215,7 @@ def test_url_blank_params():
     assert "abc" in q
     assert "def" in q
     assert "b" in q
-    assert len(q.get("abc")) == 0
+    assert len(q["abc"]) == 0
     assert len(q["a"]) == 3
     assert list(q.keys()) == ["a", "abc", "def", "b"]
 
@@ -284,7 +301,7 @@ async def test_async_big_upload_file():
 
 
 def test_formdata():
-    upload = io.BytesIO(b"test")
+    upload = UploadFile("filename", Headers())
     form = FormData([("a", "123"), ("a", "456"), ("b", upload)])
     assert "a" in form
     assert "A" not in form
@@ -309,7 +326,9 @@ def test_formdata():
 
 
 def test_mutable_multi_mapping():
-    q = MutableMultiMapping([("a", "123"), ("a", "456"), ("b", "789")])
+    q: MutableMultiMapping[str, str] = MutableMultiMapping(
+        [("a", "123"), ("a", "456"), ("b", "789")]
+    )
     assert "a" in q
     assert "A" not in q
     assert "c" not in q
@@ -393,7 +412,7 @@ def test_mutable_multi_mapping():
     q = MutableMultiMapping([("a", "123"), ("b", "456")])
     q.update({"a": "789"})
     assert q.getlist("a") == ["789"]
-    q == MutableMultiMapping([("a", "789"), ("b", "456")])
+    assert q == MutableMultiMapping([("a", "789"), ("b", "456")])
 
     q = MutableMultiMapping([("a", "123"), ("b", "456")])
     q.update(q)