diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2010-10-09 17:32:43 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2010-10-09 17:32:43 +0000 |
| commit | 62dfe54d70892a50e867712eff465bdc30762906 (patch) | |
| tree | 4523471127bc2a234a9ece6ad22414117825b879 | |
| parent | 50ce4573309c88e9f4805bc26cf84d572d894f6d (diff) | |
[1.2.X] Fixed a PendingDeprecationWarning coming from django.core.cache in Python 2.6. Backport of [14090].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/core/cache/__init__.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/django/core/cache/__init__.py b/django/core/cache/__init__.py index 680f724f94..334a932a98 100644 --- a/django/core/cache/__init__.py +++ b/django/core/cache/__init__.py @@ -15,7 +15,11 @@ cache class. See docs/cache.txt for information on the public API. """ -from cgi import parse_qsl +try: + from urlparse import parse_qsl +except ImportError: + from cgi import parse_qsl + from django.conf import settings from django.core import signals from django.core.cache.backends.base import InvalidCacheBackendError, CacheKeyWarning |