weeheavy/pelican-theme
1
0
Fork 0
forked from github/pelican
Code Pull requests Activity

Make these patches compatible with upstream master

Browse source
This commit is contained in:
Kyle Fuller 2012-03-01 14:19:46 +00:00
commit c5816c9c5a
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pelican/contents.py
View file

@ -98,7 +98,7 @@ class Page(object):
return {
'slug': getattr(self, 'slug', ''),
'lang': getattr(self, 'lang', 'en'),
'date': getattr(self, 'date', datetime.now()),
'date': getattr(self, 'date', datetime.datetime.now()),
'author': self.author,
'category': getattr(self, 'category', 'misc'),
}

2
pelican/generators.py
View file

@ -13,7 +13,7 @@ from operator import attrgetter, itemgetter
from jinja2 import Environment, FileSystemLoader, PrefixLoader, ChoiceLoader
from jinja2.exceptions import TemplateNotFound
from pelican.contents import Article, Page, is_valid_content
from pelican.contents import Article, Page, Category, is_valid_content
from pelican.log import *
from pelican.readers import read_file
from pelican.utils import copy, process_translations, open