[1.7.x] Replaced urllib/urlparse imports with from django.utils.six.moves.

Backport of 981b864fbd from master

2 files changed, 2 insertions, 9 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()
diff --git a/django/http/response.py b/django/http/response.py
index 602e03284d..27d99a621d 100644
--- a/django/http/response.py
+++ b/django/http/response.py
@@ -5,10 +5,6 @@ import json
 import sys
 import time
 from email.header import Header
-try:
-    from urllib.parse import urlparse
-except ImportError:
-    from urlparse import urlparse
 
 from django.conf import settings
 from django.core import signals
@@ -20,6 +16,7 @@ from django.utils import six, timezone
 from django.utils.encoding import force_bytes, force_text, iri_to_uri
 from django.utils.http import cookie_date
 from django.utils.six.moves import map
+from django.utils.six.moves.urllib.parse import urlparse
 
 
 # See http://www.iana.org/assignments/http-status-codes