summaryrefslogtreecommitdiff
path: root/tests/middleware
diff options
context:
space:
mode:
authorVytis Banaitis <vytis.banaitis@gmail.com>2017-02-01 18:41:56 +0200
committerTim Graham <timograham@gmail.com>2017-02-01 11:41:56 -0500
commit8838d4dd498c8f66ea4237fe8a79a5f77d6f95c9 (patch)
treeb75fa27930b8758ad36669b523b084ac09ce290b /tests/middleware
parent0ec4dc91e0e7befdd06aa0613b5d0fbe3c785ee7 (diff)
downloaddjango-8838d4dd498c8f66ea4237fe8a79a5f77d6f95c9.tar.gz
Refs #23919 -- Replaced kwargs.pop() with keyword-only arguments.
Diffstat (limited to 'tests/middleware')
-rw-r--r--tests/middleware/test_security.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/middleware/test_security.py b/tests/middleware/test_security.py
index b8e77f76e4..31a3dbb74c 100644
--- a/tests/middleware/test_security.py
+++ b/tests/middleware/test_security.py
@@ -13,19 +13,19 @@ class SecurityMiddlewareTest(SimpleTestCase):
def secure_request_kwargs(self):
return {"wsgi.url_scheme": "https"}
- def response(self, *args, **kwargs):
- headers = kwargs.pop("headers", {})
+ def response(self, *args, headers=None, **kwargs):
response = HttpResponse(*args, **kwargs)
- for k, v in headers.items():
- response[k] = v
+ if headers:
+ for k, v in headers.items():
+ response[k] = v
return response
- def process_response(self, *args, **kwargs):
+ def process_response(self, *args, secure=False, request=None, **kwargs):
request_kwargs = {}
- if kwargs.pop("secure", False):
+ if secure:
request_kwargs.update(self.secure_request_kwargs)
- request = (kwargs.pop("request", None) or
- self.request.get("/some/url", **request_kwargs))
+ if request is None:
+ request = self.request.get("/some/url", **request_kwargs)
ret = self.middleware.process_request(request)
if ret:
return ret
@@ -34,8 +34,8 @@ class SecurityMiddlewareTest(SimpleTestCase):
request = RequestFactory()
- def process_request(self, method, *args, **kwargs):
- if kwargs.pop("secure", False):
+ def process_request(self, method, *args, secure=False, **kwargs):
+ if secure:
kwargs.update(self.secure_request_kwargs)
req = getattr(self.request, method.lower())(*args, **kwargs)
return self.middleware.process_request(req)