Consistent imports for parse_qsl function, avoiding the `PendingDeprecationWarning` under Python 2.6 and later
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14297 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
40a2a1c59d
commit
6be00774a4
|
@ -16,8 +16,15 @@ See docs/cache.txt for information on the public API.
|
|||
"""
|
||||
|
||||
try:
|
||||
from urlparse import parse_qsl
|
||||
# The mod_python version is more efficient, so try importing it first.
|
||||
from mod_python.util import parse_qsl
|
||||
except ImportError:
|
||||
try:
|
||||
# Python 2.6 and greater
|
||||
from urlparse import parse_qsl
|
||||
except ImportError:
|
||||
# Python 2.5, 2.4. Works on Python 2.6 but raises
|
||||
# PendingDeprecationWarning
|
||||
from cgi import parse_qsl
|
||||
|
||||
from django.conf import settings
|
||||
|
|
|
@ -10,6 +10,12 @@ try:
|
|||
# The mod_python version is more efficient, so try importing it first.
|
||||
from mod_python.util import parse_qsl
|
||||
except ImportError:
|
||||
try:
|
||||
# Python 2.6 and greater
|
||||
from urlparse import parse_qsl
|
||||
except ImportError:
|
||||
# Python 2.5, 2.4. Works on Python 2.6 but raises
|
||||
# PendingDeprecationWarning
|
||||
from cgi import parse_qsl
|
||||
|
||||
from django.utils.datastructures import MultiValueDict, ImmutableList
|
||||
|
|
Loading…
Reference in New Issue