From: Tom Christie <tom@tomchristie.com>
Date: Fri, 17 May 2019 12:09:31 +0000 (+0100)
Subject: query_params -> params
X-Git-Tag: 0.3.1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb703771b3d5077f7be973c51a9af668b0131738;p=thirdparty%2Fhttpx.git

query_params -> params
---

bb703771b3d5077f7be973c51a9af668b0131738
diff --cc README.md
index 3a59f441,9f50f45e..69bda6ee
--- a/README.md
+++ b/README.md
@@@ -97,15 -97,15 +97,15 @@@ inspiration around the lower level netw
  >>> response = client.get('https://example.org')
  ```
  
 -* `def __init__([ssl], [timeout], [pool_limits], [max_redirects], [dispatch])`
 -* `def .request(method, url, [content], [params], [headers], [stream], [allow_redirects], [ssl], [timeout])`
 -* `def .get(url, [params], [headers], [stream], [allow_redirects], [ssl], [timeout])`
 -* `def .options(url, [params], [headers], [stream], [allow_redirects], [ssl], [timeout])`
 -* `def .head(url, [params], [headers], [stream], [allow_redirects], [ssl], [timeout])`
 -* `def .post(url, [content], [params], [headers], [stream], [allow_redirects], [ssl], [timeout])`
 -* `def .put(url, [content], [params], [headers], [stream], [allow_redirects], [ssl], [timeout])`
 -* `def .patch(url, [content], [params], [headers], [stream], [allow_redirects], [ssl], [timeout])`
 -* `def .delete(url, [content], [params], [headers], [stream], [allow_redirects], [ssl], [timeout])`
 +* `def __init__([auth], [cookies], [ssl], [timeout], [pool_limits], [max_redirects], [dispatch])`
- * `def .request(method, url, [content], [query_params], [headers], [cookies], [auth], [stream], [allow_redirects], [ssl], [timeout])`
- * `def .get(url, [query_params], [headers], [cookies], [auth], [stream], [allow_redirects], [ssl], [timeout])`
- * `def .options(url, [query_params], [headers], [cookies], [auth], [stream], [allow_redirects], [ssl], [timeout])`
- * `def .head(url, [query_params], [headers], [cookies], [auth], [stream], [allow_redirects], [ssl], [timeout])`
- * `def .post(url, [content], [query_params], [headers], [cookies], [auth], [stream], [allow_redirects], [ssl], [timeout])`
- * `def .put(url, [content], [query_params], [headers], [cookies], [auth], [stream], [allow_redirects], [ssl], [timeout])`
- * `def .patch(url, [content], [query_params], [headers], [cookies], [auth], [stream], [allow_redirects], [ssl], [timeout])`
- * `def .delete(url, [content], [query_params], [headers], [cookies], [auth], [stream], [allow_redirects], [ssl], [timeout])`
++* `def .request(method, url, [content], [params], [headers], [cookies], [auth], [stream], [allow_redirects], [ssl], [timeout])`
++* `def .get(url, [params], [headers], [cookies], [auth], [stream], [allow_redirects], [ssl], [timeout])`
++* `def .options(url, [params], [headers], [cookies], [auth], [stream], [allow_redirects], [ssl], [timeout])`
++* `def .head(url, [params], [headers], [cookies], [auth], [stream], [allow_redirects], [ssl], [timeout])`
++* `def .post(url, [content], [params], [headers], [cookies], [auth], [stream], [allow_redirects], [ssl], [timeout])`
++* `def .put(url, [content], [params], [headers], [cookies], [auth], [stream], [allow_redirects], [ssl], [timeout])`
++* `def .patch(url, [content], [params], [headers], [cookies], [auth], [stream], [allow_redirects], [ssl], [timeout])`
++* `def .delete(url, [content], [params], [headers], [cookies], [auth], [stream], [allow_redirects], [ssl], [timeout])`
  * `def .prepare_request(request)`
  * `def .send(request, [stream], [allow_redirects], [ssl], [timeout])`
  * `def .close()`
@@@ -145,7 -145,7 +145,11 @@@ what gets sent over the wire.
  >>> response = client.send(request)
  ```
  
- * `def __init__(method, url, query_params, [content], [headers], [cookies])`
++<<<<<<< HEAD
++* `def __init__(method, url, params, [content], [headers], [cookies])`
++=======
+ * `def __init__(method, url, params, content, headers)`
++>>>>>>> cookies
  * `.method` - **str** (Uppercased)
  * `.url` - **URL**
  * `.content` - **byte** or **byte async iterator**
diff --cc tests/models/test_url.py
index 98e01d9d,d185d0dd..2a45cb3b
--- a/tests/models/test_url.py
+++ b/tests/models/test_url.py
@@@ -25,13 -25,13 +25,11 @@@ def test_url()
      assert new.scheme == "http"
  
  
- def test_url_query_params():
-     url = URL("https://example.org:123/path/to/somewhere", query_params={"a": "123"})
+ def test_url__params():
+     url = URL("https://example.org:123/path/to/somewhere", params={"a": "123"})
      assert str(url) == "https://example.org:123/path/to/somewhere?a=123"
  
--    url = URL(
-         "https://example.org:123/path/to/somewhere?b=456", query_params={"a": "123"}
 -        "https://example.org:123/path/to/somewhere?b=456", params={"a": "123"}
--    )
++    url = URL("https://example.org:123/path/to/somewhere?b=456", params={"a": "123"})
      assert str(url) == "https://example.org:123/path/to/somewhere?a=123"