From 1091a8e73e7ed026a698f57799aee1c4f7bfdbf7 Mon Sep 17 00:00:00 2001
From: Ramiro Morales <cramm0@gmail.com>
Date: Thu, 3 Mar 2011 18:45:07 +0000
Subject: [PATCH] [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
---
 django/utils/http.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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'))