Fix exception triggered by all_id* and 1id_* generating scripts when a document lacks creation date. Closes #371.

- Legacy-Id: 2501
This commit is contained in:
Henrik Levkowetz 2010-08-24 13:18:11 +00:00
parent 62c16cba07
commit e74dd34d2e
2 changed files with 5 additions and 2 deletions

View file

@ -180,7 +180,10 @@ def _get_history(doc, versions):
# convert plain dates to datetimes (required for sorting)
for x in results:
if not isinstance(x['date'], datetime):
x['date'] = datetime.combine(x['date'], time(0,0,0))
if x['date']:
x['date'] = datetime.combine(x['date'], time(0,0,0))
else:
x['date'] = datetime(1970,1,1)
results.sort(key=lambda x: x['date'])
results.reverse()

View file

@ -368,7 +368,7 @@ def stable_dictsort(value, arg):
http://code.djangoproject.com/ticket/12110
"""
decorated = [(resolve_variable('var.' + arg, {'var' : item}), item) for item in value]
decorated.sort(lambda a, b: cmp(a[0], b[0]))
decorated.sort(lambda a, b: cmp(a[0], b[0]) if a[0] and b[0] else -1 if b[0] else 1 if a[0] else 0)
return [item[1] for item in decorated]
def _test():