summaryrefslogtreecommitdiff
path: root/django/core/cache/__init__.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-09-05 14:38:59 -0500
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-09-05 14:39:23 -0500
commit6a6428a36f221446b17eaf4876e92d3db1781962 (patch)
treea57290e315203b770a56b0d4691ee2d4d104cccc /django/core/cache/__init__.py
parented9cd4fd8b425ab5010b27aefc7ef6e50d55fb54 (diff)
Took advantage of django.utils.six.moves.urllib.*.
Diffstat (limited to 'django/core/cache/__init__.py')
-rw-r--r--django/core/cache/__init__.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/django/core/cache/__init__.py b/django/core/cache/__init__.py
index e1d2eb455a..2721a791fa 100644
--- a/django/core/cache/__init__.py
+++ b/django/core/cache/__init__.py
@@ -15,10 +15,6 @@ cache class.
See docs/topics/cache.txt for information on the public API.
"""
import importlib
-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 (
InvalidCacheBackendError, CacheKeyWarning, BaseCache)
from django.core.exceptions import ImproperlyConfigured
from django.utils.module_loading import import_by_path
+from django.utils.six.moves.urllib.parse import parse_qsl
__all__ = [