summaryrefslogtreecommitdiff
path: root/django/http/__init__.py
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2011-06-09 20:01:28 +0000
committerRamiro Morales <cramm0@gmail.com>2011-06-09 20:01:28 +0000
commitdff31de20aac85e4f4834c2466762cbf23fc0a7b (patch)
tree6d7d6756f53eb599b81827bf097f24cfb1ed7b54 /django/http/__init__.py
parentda0c7cd7778ee99a31587276faee30e94a8255ae (diff)
Fixed #16155 -- Removed Python 2.4 compatibility constructs from code and mentions from docs. Thanks Aymeric Augustin for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16349 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/http/__init__.py')
-rw-r--r--django/http/__init__.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/django/http/__init__.py b/django/http/__init__.py
index ae507aac63..066346c181 100644
--- a/django/http/__init__.py
+++ b/django/http/__init__.py
@@ -17,13 +17,12 @@ except ImportError:
# 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
+ # Python 2.5. Works on Python 2.6 but raises PendingDeprecationWarning
from cgi import parse_qsl
import Cookie
# httponly support exists in Python 2.6's Cookie library,
-# but not in Python 2.4 or 2.5.
+# but not in Python 2.5.
_morsel_supports_httponly = Cookie.Morsel._reserved.has_key('httponly')
# Some versions of Python 2.7 and later won't need this encoding bug fix:
_cookie_encodes_correctly = Cookie.SimpleCookie().value_encode(';') == (';', '"\\073"')