Permalink
Browse files

[1.2.X] Fixed #15543 -- Tweaked change from r15696 to not use 'if' sy…

…ntax introduce in Python 2.5. Thanks to an anonymous reporter for the heads up.

Backport of [15731] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent ef53365 commit 1091a8e73e7ed026a698f57799aee1c4f7bfdbf7 @ramiro ramiro committed Mar 3, 2011
Showing with 4 additions and 1 deletion.
  1. +4 −1 django/utils/http.py
@@ -105,7 +105,10 @@ def parse_http_date(date):
try:
year = int(m.group('year'))
if year < 100:
- year += 2000 if year < 70 else 1900
+ if year < 70:
+ year += 2000
+ else:
+ year += 1900
month = MONTHS.index(m.group('mon').lower()) + 1
day = int(m.group('day'))
hour = int(m.group('hour'))

0 comments on commit 1091a8e

Please sign in to comment.