Commit 1091a8e7 authored by Ramiro Morales's avatar Ramiro Morales
Browse files

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

[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
parent ef53365a

django/utils/http.py

+4 −1
Original line number Diff line number Diff line
@@ -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'))