Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #14132 -- Fixed feedgenerator to support years < 1900. Thanks, mk.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15503 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit bc5c2537ae3d09d3b9145beb027ff9f60eac6ba3 1 parent 47b1a8e
Jannis Leidel jezdez authored
8 django/utils/feedgenerator.py
View
@@ -27,13 +27,15 @@
import urlparse
from django.utils.xmlutils import SimplerXMLGenerator
from django.utils.encoding import force_unicode, iri_to_uri
+from django.utils import datetime_safe
def rfc2822_date(date):
# We can't use strftime() because it produces locale-dependant results, so
# we have to map english month and day names manually
months = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec',)
days = ('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun')
-
+ # Support datetime objects older than 1900
+ date = datetime_safe.new_datetime(date)
# We do this ourselves to be timezone aware, email.Utils is not tz aware.
dow = days[date.weekday()]
month = months[date.month - 1]
@@ -47,6 +49,8 @@ def rfc2822_date(date):
return time_str + '-0000'
def rfc3339_date(date):
+ # Support datetime objects older than 1900
+ date = datetime_safe.new_datetime(date)
if date.tzinfo:
time_str = date.strftime('%Y-%m-%dT%H:%M:%S')
offset = date.tzinfo.utcoffset(date)
@@ -71,7 +75,7 @@ def get_tag_uri(url, date):
d = ''
if date is not None:
- d = ',%s' % date.strftime('%Y-%m-%d')
+ d = ',%s' % datetime_safe.new_datetime(date).strftime('%Y-%m-%d')
return u'tag:%s%s:%s/%s' % (hostname, d, path, fragment)
class SyndicationFeed(object):
2  tests/regressiontests/syndication/fixtures/feeddata.json
View
@@ -4,7 +4,7 @@
"pk": 1,
"fields": {
"title": "My first entry",
- "date": "2008-01-01 12:30:00"
+ "date": "1850-01-01 12:30:00"
}
},
{
Please sign in to comment.
Something went wrong with that request. Please try again.