[1.6.x] Took advantage of django.utils.six.moves.urllib.*.

Backport of 6a6428a36 from master.

1 files changed, 1 insertions, 4 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__ = [