github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

pep8 fixes

Browse source
This commit is contained in:
Simon Conseil 2013-12-26 00:02:06 +01:00
commit c90a62ea13
2 changed files with 53 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pelican/generators.py
View file

@ -255,10 +255,12 @@ class ArticlesGenerator(Generator):
for lang, items in translations_feeds.items(): for lang, items in translations_feeds.items():
items.sort(key=attrgetter('date'), reverse=True) items.sort(key=attrgetter('date'), reverse=True)
if self.settings.get('TRANSLATION_FEED_ATOM'): if self.settings.get('TRANSLATION_FEED_ATOM'):
writer.write_feed(items, self.context, writer.write_feed(
items, self.context,
self.settings['TRANSLATION_FEED_ATOM'] % lang) self.settings['TRANSLATION_FEED_ATOM'] % lang)
if self.settings.get('TRANSLATION_FEED_RSS'): if self.settings.get('TRANSLATION_FEED_RSS'):
writer.write_feed(items, self.context, writer.write_feed(
items, self.context,
self.settings['TRANSLATION_FEED_RSS'] % lang, self.settings['TRANSLATION_FEED_RSS'] % lang,
feed_type='rss') feed_type='rss')
@ -293,15 +295,15 @@ class ArticlesGenerator(Generator):
dates=archive, blog=True) dates=archive, blog=True)
period_save_as = { period_save_as = {
'year' : self.settings['YEAR_ARCHIVE_SAVE_AS'], 'year': self.settings['YEAR_ARCHIVE_SAVE_AS'],
'month': self.settings['MONTH_ARCHIVE_SAVE_AS'], 'month': self.settings['MONTH_ARCHIVE_SAVE_AS'],
'day' : self.settings['DAY_ARCHIVE_SAVE_AS'], 'day': self.settings['DAY_ARCHIVE_SAVE_AS'],
} }
period_date_key = { period_date_key = {
'year' : attrgetter('date.year'), 'year': attrgetter('date.year'),
'month': attrgetter('date.year', 'date.month'), 'month': attrgetter('date.year', 'date.month'),
'day' : attrgetter('date.year', 'date.month', 'date.day') 'day': attrgetter('date.year', 'date.month', 'date.day')
} }
for period in 'year', 'month', 'day': for period in 'year', 'month', 'day':
@ -430,7 +432,6 @@ class ArticlesGenerator(Generator):
if hasattr(article, 'author') and article.author.name != '': if hasattr(article, 'author') and article.author.name != '':
self.authors[article.author].append(article) self.authors[article.author].append(article)
# sort the articles by date # sort the articles by date
self.articles.sort(key=attrgetter('date'), reverse=True) self.articles.sort(key=attrgetter('date'), reverse=True)
self.dates = list(self.articles) self.dates = list(self.articles)
@ -537,7 +538,8 @@ class PagesGenerator(Generator):
def generate_output(self, writer): def generate_output(self, writer):
for page in chain(self.translations, self.pages, for page in chain(self.translations, self.pages,
self.hidden_translations, self.hidden_pages): self.hidden_translations, self.hidden_pages):
writer.write_file(page.save_as, self.get_template(page.template), writer.write_file(
page.save_as, self.get_template(page.template),
self.context, page=page, self.context, page=page,
relative_urls=self.settings['RELATIVE_URLS'], relative_urls=self.settings['RELATIVE_URLS'],
override_output=hasattr(page, 'override_save_as')) override_output=hasattr(page, 'override_save_as'))
@ -586,6 +588,7 @@ class StaticGenerator(Generator):
class SourceFileGenerator(Generator): class SourceFileGenerator(Generator):
def generate_context(self): def generate_context(self):
self.output_extension = self.settings['OUTPUT_SOURCES_EXTENSION'] self.output_extension = self.settings['OUTPUT_SOURCES_EXTENSION']

3
pelican/writers.py
View file

@ -54,7 +54,8 @@ class Writer(object):
description=item.get_content(self.site_url), description=item.get_content(self.site_url),
categories=item.tags if hasattr(item, 'tags') else None, categories=item.tags if hasattr(item, 'tags') else None,
author_name=getattr(item, 'author', ''), author_name=getattr(item, 'author', ''),
pubdate=set_date_tzinfo(item.modified if hasattr(item, 'modified') else item.date, pubdate=set_date_tzinfo(
item.modified if hasattr(item, 'modified') else item.date,
self.settings.get('TIMEZONE', None))) self.settings.get('TIMEZONE', None)))
def _open_w(self, filename, encoding, override=False): def _open_w(self, filename, encoding, override=False):