mirror of
https://github.com/django/django.git
synced 2025-08-04 10:59:45 +00:00
Refs #23919 -- Removed most of remaining six usage
Thanks Tim Graham for the review.
This commit is contained in:
parent
7b2f2e74ad
commit
2b281cc35e
180 changed files with 421 additions and 559 deletions
|
@ -1,7 +1,9 @@
|
|||
import time
|
||||
from datetime import datetime, timedelta
|
||||
from http import cookies
|
||||
from io import BytesIO
|
||||
from itertools import chain
|
||||
from urllib.parse import urlencode as original_urlencode
|
||||
|
||||
from django.core.exceptions import SuspiciousOperation
|
||||
from django.core.handlers.wsgi import LimitedStream, WSGIRequest
|
||||
|
@ -14,8 +16,6 @@ from django.test.client import FakePayload
|
|||
from django.test.utils import freeze_time, str_prefix
|
||||
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
|
||||
|
||||
|
||||
|
@ -262,7 +262,7 @@ class RequestsTests(SimpleTestCase):
|
|||
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('; %s' % http_cookies.Morsel._reserved['httponly'], str(example_cookie))
|
||||
self.assertIn('; %s' % cookies.Morsel._reserved['httponly'], str(example_cookie))
|
||||
self.assertTrue(example_cookie['httponly'])
|
||||
|
||||
def test_unicode_cookie(self):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue