diff options
| -rw-r--r-- | django/http/__init__.py | 12 | ||||
| -rw-r--r-- | tests/regressiontests/requests/tests.py | 10 |
2 files changed, 19 insertions, 3 deletions
diff --git a/django/http/__init__.py b/django/http/__init__.py index 0c746fe74f..94478ae5ae 100644 --- a/django/http/__init__.py +++ b/django/http/__init__.py @@ -121,6 +121,7 @@ from django.http.utils import * from django.utils.datastructures import MultiValueDict, ImmutableList from django.utils.encoding import smart_str, iri_to_uri, force_unicode from django.utils.http import cookie_date +from django.utils import timezone RESERVED_CHARS="!*'();:@&=+$,/?%#[]" @@ -641,13 +642,18 @@ class HttpResponse(object): """ Sets a cookie. - ``expires`` can be a string in the correct format or a - ``datetime.datetime`` object in UTC. If ``expires`` is a datetime - object then ``max_age`` will be calculated. + ``expires`` can be: + - a string in the correct format, + - a naive ``datetime.datetime`` object in UTC, + - an aware ``datetime.datetime`` object in any time zone. + If it is a ``datetime.datetime`` object then ``max_age`` will be calculated. + """ self.cookies[key] = value if expires is not None: if isinstance(expires, datetime.datetime): + if timezone.is_aware(expires): + expires = timezone.make_naive(expires, timezone.utc) delta = expires - expires.utcnow() # Add one second so the date matches exactly (a fraction of # time gets lost between converting to a timedelta and diff --git a/tests/regressiontests/requests/tests.py b/tests/regressiontests/requests/tests.py index d4239448dd..b7a4788ec5 100644 --- a/tests/regressiontests/requests/tests.py +++ b/tests/regressiontests/requests/tests.py @@ -12,6 +12,7 @@ from django.http import HttpRequest, HttpResponse, parse_cookie, build_request_r from django.test.utils import get_warnings_state, restore_warnings_state from django.utils import unittest from django.utils.http import cookie_date +from django.utils.timezone import utc class RequestsTests(unittest.TestCase): @@ -207,6 +208,15 @@ class RequestsTests(unittest.TestCase): datetime_cookie = response.cookies['datetime'] self.assertEqual(datetime_cookie['max-age'], 10) + def test_aware_expiration(self): + "Cookie accepts an aware datetime as expiration time" + response = HttpResponse() + expires = (datetime.utcnow() + timedelta(seconds=10)).replace(tzinfo=utc) + time.sleep(0.001) + response.set_cookie('datetime', expires=expires) + datetime_cookie = response.cookies['datetime'] + self.assertEqual(datetime_cookie['max-age'], 10) + def test_far_expiration(self): "Cookie will expire when an distant expiration time is provided" response = HttpResponse() |