From: Tom Christie <tom@tomchristie.com>
Date: Thu, 16 Jul 2020 10:16:29 +0000 (+0100)
Subject: Support QueryParams(None) (#1060)
X-Git-Tag: 0.14.0~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff93a011a44f4a76015e4866d01ff79a6afe350a;p=thirdparty%2Fhttpx.git

Support QueryParams(None) (#1060)
---

diff --git a/httpx/_client.py b/httpx/_client.py
index 35d0bd0f..80a2bb03 100644
--- a/httpx/_client.py
+++ b/httpx/_client.py
@@ -73,9 +73,6 @@ class BaseClient:
         else:
             self.base_url = URL(base_url)
 
-        if params is None:
-            params = {}
-
         self.auth = auth
         self._params = QueryParams(params)
         self._headers = Headers(headers)
diff --git a/httpx/_models.py b/httpx/_models.py
index bf5f6d1c..1ab162cd 100644
--- a/httpx/_models.py
+++ b/httpx/_models.py
@@ -287,7 +287,7 @@ class QueryParams(typing.Mapping[str, str]):
         value = args[0] if args else kwargs
 
         items: typing.Sequence[typing.Tuple[str, PrimitiveData]]
-        if isinstance(value, str):
+        if value is None or isinstance(value, str):
             items = parse_qsl(value)
         elif isinstance(value, QueryParams):
             items = value.multi_items()
diff --git a/httpx/_types.py b/httpx/_types.py
index d2fc098e..bfce5650 100644
--- a/httpx/_types.py
+++ b/httpx/_types.py
@@ -34,6 +34,7 @@ QueryParamTypes = Union[
     Mapping[str, Union[PrimitiveData, Sequence[PrimitiveData]]],
     List[Tuple[str, PrimitiveData]],
     str,
+    None,
 ]
 
 HeaderTypes = Union[
diff --git a/tests/models/test_queryparams.py b/tests/models/test_queryparams.py
index 0b0101cb..99f193f8 100644
--- a/tests/models/test_queryparams.py
+++ b/tests/models/test_queryparams.py
@@ -44,6 +44,9 @@ def test_queryparams(source):
 
 
 def test_queryparam_types():
+    q = QueryParams(None)
+    assert str(q) == ""
+
     q = QueryParams({"a": True})
     assert str(q) == "a=true"