5 files changed, 7 insertions, 21 deletions
diff --git a/django/core/cache/__init__.py b/django/core/cache/__init__.py
index 1242372dcf..ea3a68ff0e 100644
--- a/django/core/cache/__init__.py
+++ b/django/core/cache/__init__.py
@@ -14,10 +14,6 @@ cache class.
 
 See docs/topics/cache.txt for information on the public API.
 """
-try:
-    from urllib.parse import parse_qsl
-except ImportError:     # Python 2
-    from urlparse import parse_qsl
 
 from django.conf import settings
 from django.core import signals
@@ -26,6 +22,7 @@ from django.core.cache.backends.base import (
 from django.core.exceptions import ImproperlyConfigured
 from django.utils import importlib
 from django.utils.module_loading import import_by_path
+from django.utils.six.moves.urllib.parse import parse_qsl
 
 
 __all__ = [
diff --git a/django/core/files/storage.py b/django/core/files/storage.py
index 5d301a317c..80123781f6 100644
--- a/django/core/files/storage.py
+++ b/django/core/files/storage.py
@@ -1,9 +1,5 @@
 import os
 import errno
-try:
-    from urllib.parse import urljoin
-except ImportError:     # Python 2
-    from urlparse import urljoin
 import itertools
 from datetime import datetime
 
@@ -14,6 +10,7 @@ from django.core.files.move import file_move_safe
 from django.utils.encoding import force_text, filepath_to_uri
 from django.utils.functional import LazyObject
 from django.utils.module_loading import import_by_path
+from django.utils.six.moves.urllib.parse import urljoin
 from django.utils.text import get_valid_filename
 from django.utils._os import safe_join, abspathu
 
diff --git a/django/core/management/templates.py b/django/core/management/templates.py
index 1de508d749..164fd071e5 100644
--- a/django/core/management/templates.py
+++ b/django/core/management/templates.py
@@ -8,10 +8,6 @@ import shutil
 import stat
 import sys
 import tempfile
-try:
-    from urllib.request import urlretrieve
-except ImportError:     # Python 2
-    from urllib import urlretrieve
 
 from optparse import make_option
 from os import path
@@ -19,6 +15,7 @@ from os import path
 import django
 from django.template import Template, Context
 from django.utils import archive
+from django.utils.six.moves.urllib.request import urlretrieve
 from django.utils._os import rmtree_errorhandler
 from django.core.management.base import BaseCommand, CommandError
 from django.core.management.utils import handle_extensions
diff --git a/django/core/servers/basehttp.py b/django/core/servers/basehttp.py
index 387da6b3cd..6287b1a4f9 100644
--- a/django/core/servers/basehttp.py
+++ b/django/core/servers/basehttp.py
@@ -13,11 +13,6 @@ from io import BytesIO
 import socket
 import sys
 import traceback
-try:
-    from urllib.parse import urljoin
-except ImportError:     # Python 2
-    from urlparse import urljoin
-from django.utils.six.moves import socketserver
 from wsgiref import simple_server
 from wsgiref.util import FileWrapper   # for backwards compatibility
 
@@ -25,6 +20,8 @@ from django.core.management.color import color_style
 from django.core.wsgi import get_wsgi_application
 from django.utils.module_loading import import_by_path
 from django.utils import six
+from django.utils.six.moves.urllib.parse import urljoin
+from django.utils.six.moves import socketserver
 
 __all__ = ('WSGIServer', 'WSGIRequestHandler', 'MAX_SOCKET_CHUNK_SIZE')
 
diff --git a/django/core/validators.py b/django/core/validators.py
index aa417ed099..78716ccd40 100644
--- a/django/core/validators.py
+++ b/django/core/validators.py
@@ -1,16 +1,14 @@
 from __future__ import unicode_literals
 
 import re
-try:
-    from urllib.parse import urlsplit, urlunsplit
-except ImportError:     # Python 2
-    from urlparse import urlsplit, urlunsplit
 
 from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _, ungettext_lazy
 from django.utils.encoding import force_text
 from django.utils.ipv6 import is_valid_ipv6_address
 from django.utils import six
+from django.utils.six.moves.urllib.parse import urlsplit, urlunsplit
+
 
 # These values, if given to validate(), will trigger the self.required check.
 EMPTY_VALUES = (None, '', [], (), {})