summaryrefslogtreecommitdiff
path: root/tests/middleware
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2017-01-07 12:11:46 +0100
committerClaude Paroz <claude@2xlibre.net>2017-01-18 21:33:28 +0100
commit2b281cc35ed9d997614ca3c416928d7fabfef1ad (patch)
treed3e73cf44b15139aa9f1f53e398942ba64f5e190 /tests/middleware
parent7b2f2e74adb36a4334e83130f6abc2f79d395235 (diff)
Refs #23919 -- Removed most of remaining six usage
Thanks Tim Graham for the review.
Diffstat (limited to 'tests/middleware')
-rw-r--r--tests/middleware/tests.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/middleware/tests.py b/tests/middleware/tests.py
index 3c0d3d81ea..8749a9ee50 100644
--- a/tests/middleware/tests.py
+++ b/tests/middleware/tests.py
@@ -1,7 +1,9 @@
import gzip
import random
import re
+import struct
from io import BytesIO
+from urllib.parse import quote
from django.conf import settings
from django.core import mail
@@ -19,11 +21,10 @@ from django.middleware.http import ConditionalGetMiddleware
from django.test import (
RequestFactory, SimpleTestCase, ignore_warnings, override_settings,
)
-from django.utils import six
from django.utils.deprecation import RemovedInDjango21Warning
from django.utils.encoding import force_str
-from django.utils.six.moves import range
-from django.utils.six.moves.urllib.parse import quote
+
+int2byte = struct.Struct(">B").pack
@override_settings(ROOT_URLCONF='middleware.urls')
@@ -732,7 +733,7 @@ class GZipMiddlewareTest(SimpleTestCase):
"""
short_string = b"This string is too short to be worth compressing."
compressible_string = b'a' * 500
- incompressible_string = b''.join(six.int2byte(random.randint(0, 255)) for _ in range(500))
+ incompressible_string = b''.join(int2byte(random.randint(0, 255)) for _ in range(500))
sequence = [b'a' * 500, b'b' * 200, b'a' * 300]
sequence_unicode = ['a' * 500, 'é' * 200, 'a' * 300]