Merge branch 'master' into master

Author: Cito

gql/transport/requests.py

@@ -18,17 +18,17 @@ class RequestsHTTPTransport(Transport):
     """
 
     def __init__(
-        self,
-        url: str,
-        headers: Optional[Dict[str, Any]] = None,
-        cookies: Optional[Union[Dict[str, Any], RequestsCookieJar]] = None,
-        auth: Optional[AuthBase] = None,
-        use_json: bool = False,
-        timeout: Optional[int] = None,
-        verify: bool = True,
-        retries: int = 0,
-        method: str = "POST",
-        **kwargs,
+        self,  # type: RequestsHTTPTransport
+        url,  # type: str
+        headers=None,  # type: Dict[str, Any]
+        cookies=None,  # type: Union[Dict[str, Any], RequestsCookieJar]
+        auth=None,  # type: AuthBase
+        use_json=True,  # type: bool
+        timeout=None,  # type: int
+        verify=True,  # type: bool
+        retries=0,  # type: int
+        method="POST",  # type: str
+        **kwargs  # type: Any
     ):
         """Initialize the transport with the given request parameters.
 

tests/test_client.py

@@ -81,11 +81,8 @@ def test_no_schema_exception():
 def test_execute_result_error():
 
     client = Client(
-        transport=RequestsHTTPTransport(
-            url="https://countries.trevorblades.com/",
-            use_json=True,
-            headers={"Content-type": "application/json"},
-        ),
+        retries=expected_retries,
+        transport=RequestsHTTPTransport(url="https://countries.trevorblades.com/",),
     )
 
     failing_query = gql(
@@ -110,6 +107,7 @@ def test_http_transport_raise_for_status_error(http_transport_query):
     client = Client(
         transport=RequestsHTTPTransport(
             url="https://countries.trevorblades.com/",
+            use_json=False,
             headers={"Content-type": "application/json"},
         )
     )
@@ -123,10 +121,7 @@ def test_http_transport_raise_for_status_error(http_transport_query):
 def test_http_transport_verify_error(http_transport_query):
     client = Client(
         transport=RequestsHTTPTransport(
-            url="https://countries.trevorblades.com/",
-            use_json=True,
-            headers={"Content-type": "application/json"},
-            verify=False,
+            url="https://countries.trevorblades.com/", verify=False,
         )
     )
     with pytest.warns(Warning) as record:
@@ -139,10 +134,7 @@ def test_http_transport_verify_error(http_transport_query):
 def test_http_transport_specify_method_valid(http_transport_query):
     client = Client(
         transport=RequestsHTTPTransport(
-            url="https://countries.trevorblades.com/",
-            use_json=True,
-            headers={"Content-type": "application/json"},
-            method="POST",
+            url="https://countries.trevorblades.com/", method="POST",
         )
     )
 
@@ -154,10 +146,7 @@ def test_http_transport_specify_method_valid(http_transport_query):
 def test_http_transport_specify_method_invalid(http_transport_query):
     client = Client(
         transport=RequestsHTTPTransport(
-            url="https://countries.trevorblades.com/",
-            use_json=True,
-            headers={"Content-type": "application/json"},
-            method="GET",
+            url="https://countries.trevorblades.com/", method="GET",
         )
     )