diff options
| author | Claude Paroz <claude@2xlibre.net> | 2017-01-07 12:11:46 +0100 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2017-01-18 21:33:28 +0100 |
| commit | 2b281cc35ed9d997614ca3c416928d7fabfef1ad (patch) | |
| tree | d3e73cf44b15139aa9f1f53e398942ba64f5e190 /django/http/request.py | |
| parent | 7b2f2e74adb36a4334e83130f6abc2f79d395235 (diff) | |
Refs #23919 -- Removed most of remaining six usage
Thanks Tim Graham for the review.
Diffstat (limited to 'django/http/request.py')
| -rw-r--r-- | django/http/request.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/django/http/request.py b/django/http/request.py index fe1684ee58..a930c93b26 100644 --- a/django/http/request.py +++ b/django/http/request.py @@ -3,6 +3,7 @@ import re import sys from io import BytesIO from itertools import chain +from urllib.parse import quote, urlencode, urljoin, urlsplit from django.conf import settings from django.core import signing @@ -17,9 +18,6 @@ from django.utils.encoding import ( escape_uri_path, force_bytes, force_str, iri_to_uri, ) from django.utils.http import is_same_domain, limited_parse_qsl -from django.utils.six.moves.urllib.parse import ( - quote, urlencode, urljoin, urlsplit, -) RAISE_ERROR = object() host_validation_re = re.compile(r"^([a-z0-9.-]+|\[[a-f0-9]*:[a-f0-9\.:]+\])(:\d+)?$") @@ -431,14 +429,14 @@ class QueryDict(MultiValueDict): def __copy__(self): result = self.__class__('', mutable=True, encoding=self.encoding) - for key, value in six.iterlists(self): + for key, value in self.lists(): result.setlist(key, value) return result def __deepcopy__(self, memo): result = self.__class__('', mutable=True, encoding=self.encoding) memo[id(self)] = result - for key, value in six.iterlists(self): + for key, value in self.lists(): result.setlist(copy.deepcopy(key, memo), copy.deepcopy(value, memo)) return result |
