summaryrefslogtreecommitdiff
path: root/django/http/request.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-03-31 07:54:22 -0400
committerTim Graham <timograham@gmail.com>2014-03-31 07:54:22 -0400
commit981b864fbd28590c4ac829ce55bb7543f57d1de8 (patch)
tree5987e6598dba3ab0fd3b8f9daad428147526e8bf /django/http/request.py
parent4339e9a92d98371a50a6fe54ab7ea0c602ecee28 (diff)
downloaddjango-981b864fbd28590c4ac829ce55bb7543f57d1de8.tar.gz
Replaced urllib/urlparse imports with from django.utils.six.moves.
Diffstat (limited to 'django/http/request.py')
-rw-r--r--django/http/request.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/django/http/request.py b/django/http/request.py
index 6bce1f718d..4f272ec2c7 100644
--- a/django/http/request.py
+++ b/django/http/request.py
@@ -6,11 +6,6 @@ import re
import sys
from io import BytesIO
from pprint import pformat
-try:
- from urllib.parse import parse_qsl, urlencode, quote, urljoin
-except ImportError:
- from urllib import urlencode, quote
- from urlparse import parse_qsl, urljoin
from django.conf import settings
from django.core import signing
@@ -20,6 +15,7 @@ from django.http.multipartparser import MultiPartParser, MultiPartParserError
from django.utils import six
from django.utils.datastructures import MultiValueDict, ImmutableList
from django.utils.encoding import force_bytes, force_text, force_str, iri_to_uri
+from django.utils.six.moves.urllib.parse import parse_qsl, urlencode, quote, urljoin
RAISE_ERROR = object()