Permalink
Browse files

Fixed #24153 -- Fixed cookie test compatibility with Python 3.4.3+

  • Loading branch information...
1 parent f601931 commit b19b81b3960ec2090d40be65547502a3386a769b @timgraham timgraham committed Jan 19, 2015
Showing with 5 additions and 3 deletions.
  1. +3 −2 django/contrib/sessions/tests.py
  2. +2 −1 tests/requests/tests.py
@@ -24,6 +24,7 @@
from django.utils import six
from django.utils import timezone
from django.utils.encoding import force_text
+from django.utils.six.moves import http_cookies
from django.contrib.sessions.exceptions import InvalidSessionKey
@@ -543,7 +544,7 @@ def test_httponly_session_cookie(self):
response = middleware.process_response(request, response)
self.assertTrue(
response.cookies[settings.SESSION_COOKIE_NAME]['httponly'])
- self.assertIn('httponly',
+ self.assertIn(http_cookies.Morsel._reserved['httponly'],
str(response.cookies[settings.SESSION_COOKIE_NAME]))
@override_settings(SESSION_COOKIE_HTTPONLY=False)
@@ -560,7 +561,7 @@ def test_no_httponly_session_cookie(self):
response = middleware.process_response(request, response)
self.assertFalse(response.cookies[settings.SESSION_COOKIE_NAME]['httponly'])
- self.assertNotIn('httponly',
+ self.assertNotIn(http_cookies.Morsel._reserved['httponly'],
str(response.cookies[settings.SESSION_COOKIE_NAME]))
def test_session_save_on_500(self):
View
@@ -16,6 +16,7 @@
from django.utils import six
from django.utils.encoding import force_str
from django.utils.http import cookie_date, urlencode
+from django.utils.six.moves import http_cookies
from django.utils.six.moves.urllib.parse import urlencode as original_urlencode
from django.utils.timezone import utc
@@ -221,7 +222,7 @@ def test_httponly_cookie(self):
example_cookie = response.cookies['example']
# A compat cookie may be in use -- check that it has worked
# both as an output string, and using the cookie attributes
- self.assertIn('; httponly', str(example_cookie))
+ self.assertIn('; %s' % http_cookies.Morsel._reserved['httponly'], str(example_cookie))
self.assertTrue(example_cookie['httponly'])
def test_unicode_cookie(self):

0 comments on commit b19b81b

Please sign in to comment.