summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Wilson Jr <gary.wilson@gmail.com>2008-07-02 04:48:58 +0000
committerGary Wilson Jr <gary.wilson@gmail.com>2008-07-02 04:48:58 +0000
commitf5c1bb1cad5d06935ed07bbeace64be36643f512 (patch)
tree9ce6fcdec8d31e98bcf5ada7c5d0e138e8132d07
parent7e210f68a9d2b4f7ebce5fdb2afdb517c18fc5aa (diff)
Got rid of a bit of repetition by using `dict.update()`.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7821 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/test/client.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/django/test/client.py b/django/test/client.py
index bfe3e16f3a..87731043a7 100644
--- a/django/test/client.py
+++ b/django/test/client.py
@@ -291,12 +291,16 @@ class Client:
login(request, user)
# Set the cookie to represent the session.
- self.cookies[settings.SESSION_COOKIE_NAME] = request.session.session_key
- self.cookies[settings.SESSION_COOKIE_NAME]['max-age'] = None
- self.cookies[settings.SESSION_COOKIE_NAME]['path'] = '/'
- self.cookies[settings.SESSION_COOKIE_NAME]['domain'] = settings.SESSION_COOKIE_DOMAIN
- self.cookies[settings.SESSION_COOKIE_NAME]['secure'] = settings.SESSION_COOKIE_SECURE or None
- self.cookies[settings.SESSION_COOKIE_NAME]['expires'] = None
+ session_cookie = settings.SESSION_COOKIE_NAME
+ self.cookies[session_cookie] = request.session.session_key
+ cookie_data = {
+ 'max-age': None,
+ 'path': '/',
+ 'domain': settings.SESSION_COOKIE_DOMAIN,
+ 'secure': settings.SESSION_COOKIE_SECURE or None,
+ 'expires': None,
+ }
+ self.cookies[session_cookie].update(cookie_data)
# Save the session values.
request.session.save()