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

Backport of 981b864fbd from master

1 files changed, 1 insertions, 5 deletions

diff --git a/django/http/request.py b/django/http/request.py
index b7f9d241a7..dee6910382 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
 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()