Merge pull request #648 from adamtheturtle/fewer-preps

Use CaseInsensitiveDicts to remove type ignores

Author: adamtheturtle

tests/mock_vws/test_add_target.py

@@ -253,8 +253,8 @@ def test_name_valid(
             (None, codes.BAD_REQUEST),
             (chr(_MAX_CHAR_VALUE + 1), codes.INTERNAL_SERVER_ERROR),
             (
-                chr(_MAX_CHAR_VALUE + 1) *
-                (_MAX_NAME_LENGTH + 1), codes.BAD_REQUEST,
+                chr(_MAX_CHAR_VALUE + 1) * (_MAX_NAME_LENGTH + 1),
+                codes.BAD_REQUEST,
             ),
         ],
         ids=[

tests/mock_vws/test_authorization_header.py

@@ -8,6 +8,7 @@
 import pytest
 import requests
 from requests import codes
+from requests.structures import CaseInsensitiveDict
 
 from mock_vws._constants import ResultCodes
 from tests.mock_vws.utils import Endpoint
@@ -39,9 +40,7 @@ def test_missing(self, endpoint: Endpoint) -> None:
 
         headers.pop('Authorization', None)
 
-        endpoint.prepared_request.prepare_headers(  # type: ignore
-            headers=headers,
-        )
+        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
         session = requests.Session()
         response = session.send(  # type: ignore
             request=endpoint.prepared_request,
@@ -77,9 +76,7 @@ def test_incorrect(self, endpoint: Endpoint) -> None:
             'Date': date,
         }
 
-        endpoint.prepared_request.prepare_headers(  # type: ignore
-            headers=headers,
-        )
+        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
         session = requests.Session()
         response = session.send(  # type: ignore
             request=endpoint.prepared_request,

tests/mock_vws/test_date_header.py

@@ -11,6 +11,7 @@
 import requests
 from freezegun import freeze_time
 from requests import codes
+from requests.structures import CaseInsensitiveDict
 
 from mock_vws._constants import ResultCodes
 from tests.mock_vws.utils import Endpoint
@@ -62,10 +63,7 @@ def test_no_date_header(
             'Authorization': authorization_string,
         }
         headers.pop('Date', None)
-
-        endpoint.prepared_request.prepare_headers(  # type: ignore
-            headers=headers,
-        )
+        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
         session = requests.Session()
         response = session.send(  # type: ignore
             request=endpoint.prepared_request,
@@ -135,9 +133,7 @@ def test_incorrect_date_format(
             'Date': date_incorrect_format,
         }
 
-        endpoint.prepared_request.prepare_headers(  # type: ignore
-            headers=headers,
-        )
+        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
         session = requests.Session()
         response = session.send(  # type: ignore
             request=endpoint.prepared_request,
@@ -218,9 +214,7 @@ def test_date_out_of_range(
             'Date': date,
         }
 
-        endpoint.prepared_request.prepare_headers(  # type: ignore
-            headers=headers,
-        )
+        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
         session = requests.Session()
         response = session.send(  # type: ignore
             request=endpoint.prepared_request,
@@ -282,9 +276,7 @@ def test_date_in_range(
             'Date': date,
         }
 
-        endpoint.prepared_request.prepare_headers(  # type: ignore
-            headers=headers,
-        )
+        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
         session = requests.Session()
         response = session.send(  # type: ignore
             request=endpoint.prepared_request,

tests/mock_vws/test_invalid_json.py

@@ -10,6 +10,7 @@
 import requests
 from freezegun import freeze_time
 from requests import codes
+from requests.structures import CaseInsensitiveDict
 
 from mock_vws._constants import ResultCodes
 from tests.mock_vws.utils import Endpoint
@@ -66,14 +67,8 @@ def test_invalid_json(
             'Date': date,
         }
 
-        endpoint.prepared_request.prepare_body(  # type: ignore
-            data=content,
-            files=None,
-        )
-
-        endpoint.prepared_request.prepare_headers(  # type: ignore
-            headers=headers,
-        )
+        endpoint.prepared_request.body = content
+        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
         endpoint.prepared_request.prepare_content_length(  # type: ignore
             body=content,
         )

tests/mock_vws/test_unexpected_json.py

@@ -8,6 +8,7 @@
 import pytest
 import requests
 from requests import codes
+from requests.structures import CaseInsensitiveDict
 
 from mock_vws._constants import ResultCodes
 from tests.mock_vws.utils import Endpoint
@@ -62,13 +63,8 @@ def test_does_not_take_data(
             'Content-Type': content_type,
         }
 
-        endpoint.prepared_request.prepare_body(  # type: ignore
-            data=content,
-            files=None,
-        )
-        endpoint.prepared_request.prepare_headers(  # type: ignore
-            headers=headers,
-        )
+        endpoint.prepared_request.body = content
+        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
         endpoint.prepared_request.prepare_content_length(  # type: ignore
             body=content,
         )

tests/mock_vws/test_update_target.py

@@ -538,8 +538,8 @@ def test_name_valid(
             (None, codes.BAD_REQUEST),
             (chr(_MAX_CHAR_VALUE + 1), codes.INTERNAL_SERVER_ERROR),
             (
-                chr(_MAX_CHAR_VALUE + 1) *
-                (_MAX_NAME_LENGTH + 1), codes.BAD_REQUEST,
+                chr(_MAX_CHAR_VALUE + 1) * (_MAX_NAME_LENGTH + 1),
+                codes.BAD_REQUEST,
             ),
         ],
         ids=[