Do not unnecessarily copy request headers in tests

tests/mock_vws/test_authorization_header.py

@@ -46,12 +46,9 @@
         is given.
         """
         date = rfc_1123_date()
-        headers = endpoint.prepared_request.headers.copy()
-        headers.update({"Date": date})
+        endpoint.prepared_request.headers.update({"Date": date})
+        endpoint.prepared_request.headers.pop("Authorization", None)
 
-        headers.pop("Authorization", None)
-
-        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -96,10 +93,10 @@
         # string, but really any string which is not two parts when split on a
         # space will do.
         authorization_string = "VWS"
-        headers = endpoint.prepared_request.headers.copy()
-        headers.update({"Authorization": authorization_string, "Date": date})
+        endpoint.prepared_request.headers.update(
+            {"Authorization": authorization_string, "Date": date},
+        )
 
-        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -134,10 +131,10 @@
         authorization_string = "VWS "
         date = rfc_1123_date()
 
-        headers = endpoint.prepared_request.headers.copy()
-        headers.update({"Authorization": authorization_string, "Date": date})
+        endpoint.prepared_request.headers.update(
+            {"Authorization": authorization_string, "Date": date},
+        )
 
-        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -171,10 +168,10 @@
         date = rfc_1123_date()
 
         authorization_string = "VWS foobar:"
-        headers = endpoint.prepared_request.headers.copy()
-        headers.update({"Authorization": authorization_string, "Date": date})
+        endpoint.prepared_request.headers.update(
+            {"Authorization": authorization_string, "Date": date},
+        )
 
-        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)

tests/mock_vws/test_content_length.py

@@ -41,13 +41,13 @@
         A ``BAD_REQUEST`` error is given when the given ``Content-Length`` is
         not an integer.
         """
-        headers = endpoint.prepared_request.headers.copy()
-        if not headers.get("Content-Type"):
+        if not endpoint.prepared_request.headers.get("Content-Type"):
             return
 
         content_length = "0.4"
-        headers.update({"Content-Length": content_length})
-        endpoint.prepared_request.headers = headers
+        endpoint.prepared_request.headers.update(
+            {"Content-Length": content_length},
+        )
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -94,16 +94,18 @@
         """
         An error is given if the given content length is too large.
         """
-        headers = endpoint.prepared_request.headers.copy()
-        if not headers.get("Content-Type"):
+        if not endpoint.prepared_request.headers.get("Content-Type"):
             pytest.skip("No Content-Type header for this request")
 
         url = str(endpoint.prepared_request.url)
         netloc = urlparse(url).netloc
-        content_length = str(int(headers["Content-Length"]) + 1)
-        headers.update({"Content-Length": content_length})
+        content_length = str(
+            int(endpoint.prepared_request.headers["Content-Length"]) + 1
+        )
+        endpoint.prepared_request.headers.update(
+            {"Content-Length": content_length}
+        )
 
-        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         # We do not use ``handle_server_errors`` here because we do not want to
@@ -141,14 +143,16 @@
         An ``UNAUTHORIZED`` response is given if the given content length is
         too small.
         """
-        headers = endpoint.prepared_request.headers.copy()
-        if not headers.get("Content-Type"):
+        if not endpoint.prepared_request.headers.get("Content-Type"):
             return
 
-        content_length = str(int(headers["Content-Length"]) - 1)
-        headers.update({"Content-Length": content_length})
+        content_length = str(
+            int(endpoint.prepared_request.headers["Content-Length"]) - 1
+        )
+        endpoint.prepared_request.headers.update(
+            {"Content-Length": content_length}
+        )
 
-        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)

tests/mock_vws/test_date_header.py

@@ -54,10 +54,10 @@
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers = endpoint.prepared_request.headers.copy()
-        headers.update({"Authorization": authorization_string})
-        headers.pop("Date", None)
-        endpoint.prepared_request.headers = headers
+        endpoint.prepared_request.headers.update(
+            {"Authorization": authorization_string}
+        )
+        endpoint.prepared_request.headers.pop("Date", None)
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -105,8 +105,6 @@
             now = datetime.now(tz=gmt)
             date_incorrect_format = now.strftime("%a %b %d %H:%M:%S")
 
-        headers = endpoint.prepared_request.headers.copy()
-
         authorization_string = authorization_header(
             access_key=endpoint.access_key,
             secret_key=endpoint.secret_key,
@@ -117,14 +115,13 @@
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers.update(
+        endpoint.prepared_request.headers.update(
             {
                 "Authorization": authorization_string,
                 "Date": date_incorrect_format,
             },
         )
 
-        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -188,10 +185,10 @@
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers = endpoint.prepared_request.headers.copy()
-        headers.update({"Authorization": authorization_string, "Date": date})
+        endpoint.prepared_request.headers.update(
+            {"Authorization": authorization_string, "Date": date}
+        )
 
-        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -248,10 +245,10 @@
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers = endpoint.prepared_request.headers.copy()
-        headers.update({"Authorization": authorization_string, "Date": date})
+        endpoint.prepared_request.headers.update(
+            {"Authorization": authorization_string, "Date": date},
+        )
 
-        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -297,8 +294,6 @@
         with freeze_time(datetime.now(tz=gmt) + time_difference_from_now):
             date = rfc_1123_date()
 
-        headers = endpoint.prepared_request.headers.copy()
-
         authorization_string = authorization_header(
             access_key=endpoint.access_key,
             secret_key=endpoint.secret_key,
@@ -309,9 +304,10 @@
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers.update({"Authorization": authorization_string, "Date": date})
+        endpoint.prepared_request.headers.update(
+            {"Authorization": authorization_string, "Date": date},
+        )
 
-        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -358,10 +354,10 @@
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers = endpoint.prepared_request.headers.copy()
-        headers.update({"Authorization": authorization_string, "Date": date})
+        endpoint.prepared_request.headers.update(
+            {"Authorization": authorization_string, "Date": date},
+        )
 
-        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)

tests/mock_vws/test_invalid_json.py

@@ -56,11 +56,11 @@
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers = endpoint.prepared_request.headers.copy()
-        headers.update({"Authorization": authorization_string, "Date": date})
+        endpoint.prepared_request.headers.update(
+            {"Authorization": authorization_string, "Date": date}
+        )
 
         endpoint.prepared_request.body = content
-        endpoint.prepared_request.headers = headers
         endpoint.prepared_request.prepare_content_length(body=content)
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
@@ -125,11 +125,11 @@
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers = endpoint.prepared_request.headers.copy()
-        headers.update({"Authorization": authorization_string, "Date": date})
+        endpoint.prepared_request.headers.update(
+            {"Authorization": authorization_string, "Date": date},
+        )
 
         endpoint.prepared_request.body = content
-        endpoint.prepared_request.headers = headers
         endpoint.prepared_request.prepare_content_length(body=content)
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)

tests/mock_vws/test_unexpected_json.py

@@ -43,8 +43,6 @@
         content_type = "application/json"
         date = rfc_1123_date()
 
-        headers = endpoint.prepared_request.headers.copy()
-
         authorization_string = authorization_header(
             access_key=endpoint.access_key,
             secret_key=endpoint.secret_key,
@@ -55,7 +53,7 @@
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers.update(
+        endpoint.prepared_request.headers.update(
             {
                 "Authorization": authorization_string,
                 "Date": date,
@@ -64,7 +62,6 @@
         )
 
         endpoint.prepared_request.body = content
-        endpoint.prepared_request.headers = headers
         endpoint.prepared_request.prepare_content_length(body=content)
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)