summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2011-03-03 18:45:07 +0000
committerRamiro Morales <cramm0@gmail.com>2011-03-03 18:45:07 +0000
commit1091a8e73e7ed026a698f57799aee1c4f7bfdbf7 (patch)
treeb730205a867e97db80f17f4c6c8472eb242cdde4
parentef53365a7d268ee53e3fdb8847f417d27c1fb5dc (diff)
[1.2.X] Fixed #15543 -- Tweaked change from r15696 to not use 'if' syntax 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
-rw-r--r--django/utils/http.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/utils/http.py b/django/utils/http.py
index 61623fc696..41014ed87a 100644
--- a/django/utils/http.py
+++ b/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'))