Took advantage of django.utils.six.moves.urllib.*.

django/contrib/staticfiles/handlers.py

@@ -1,13 +1,8 @@
-try:
-    from urllib.parse import urlparse
-    from urllib.request import url2pathname
-except ImportError:     # Python 2
-    from urllib import url2pathname
-    from urlparse import urlparse
-
 from django.conf import settings
 from django.core.handlers.base import get_path_info
 from django.core.handlers.wsgi import WSGIHandler
+from django.utils.six.moves.urllib.parse import urlparse
+from django.utils.six.moves.urllib.request import url2pathname
 
 from django.contrib.staticfiles import utils
 from django.contrib.staticfiles.views import serve

django/contrib/staticfiles/storage.py

@@ -5,11 +5,6 @@ from importlib import import_module
 import os
 import posixpath
 import re
-try:
-    from urllib.parse import unquote, urlsplit, urlunsplit, urldefrag
-except ImportError:     # Python 2
-    from urllib import unquote
-    from urlparse import urlsplit, urlunsplit, urldefrag
 
 from django.conf import settings
 from django.core.cache import (get_cache, InvalidCacheBackendError,
@@ -19,6 +14,7 @@ from django.core.files.base import ContentFile
 from django.core.files.storage import FileSystemStorage, get_storage_class
 from django.utils.encoding import force_bytes, force_text
 from django.utils.functional import LazyObject
+from django.utils.six.moves.urllib.parse import unquote, urlsplit, urlunsplit, urldefrag
 from django.utils._os import upath
 
 from django.contrib.staticfiles.utils import check_settings, matches_patterns

django/contrib/staticfiles/views.py

@@ -5,13 +5,10 @@ development, and SHOULD NOT be used in a production setting.
 """
 import os
 import posixpath
-try:
-    from urllib.parse import unquote
-except ImportError:     # Python 2
-    from urllib import unquote
 
 from django.conf import settings
 from django.http import Http404
+from django.utils.six.moves.urllib.parse import unquote
 from django.views import static
 
 from django.contrib.staticfiles import finders