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

83
pelican/generators.py
View file

@ -255,20 +255,22 @@ 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(
self.settings['TRANSLATION_FEED_ATOM'] % lang) items, self.context,
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(
self.settings['TRANSLATION_FEED_RSS'] % lang, items, self.context,
feed_type='rss') self.settings['TRANSLATION_FEED_RSS'] % lang,
feed_type='rss')
def generate_articles(self, write): def generate_articles(self, write):
"""Generate the articles.""" """Generate the articles."""
for article in chain(self.translations, self.articles): for article in chain(self.translations, self.articles):
signals.article_generator_write_article.send(self, content=article) signals.article_generator_write_article.send(self, content=article)
write(article.save_as, self.get_template(article.template), write(article.save_as, self.get_template(article.template),
self.context, article=article, category=article.category, self.context, article=article, category=article.category,
override_output=hasattr(article, 'override_save_as')) override_output=hasattr(article, 'override_save_as'))
def generate_period_archives(self, write): def generate_period_archives(self, write):
"""Generate per-year, per-month, and per-day archives.""" """Generate per-year, per-month, and per-day archives."""
@ -293,16 +295,16 @@ 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':
save_as = period_save_as[period] save_as = period_save_as[period]
@ -318,13 +320,13 @@ class ArticlesGenerator(Generator):
if template in PAGINATED_TEMPLATES: if template in PAGINATED_TEMPLATES:
paginated = {'articles': self.articles, 'dates': self.dates} paginated = {'articles': self.articles, 'dates': self.dates}
save_as = self.settings.get("%s_SAVE_AS" % template.upper(), save_as = self.settings.get("%s_SAVE_AS" % template.upper(),
'%s.html' % template) '%s.html' % template)
if not save_as: if not save_as:
continue continue
write(save_as, self.get_template(template), write(save_as, self.get_template(template),
self.context, blog=True, paginated=paginated, self.context, blog=True, paginated=paginated,
page_name=os.path.splitext(save_as)[0]) page_name=os.path.splitext(save_as)[0])
def generate_tags(self, write): def generate_tags(self, write):
"""Generate Tags pages.""" """Generate Tags pages."""
@ -333,9 +335,9 @@ class ArticlesGenerator(Generator):
articles.sort(key=attrgetter('date'), reverse=True) articles.sort(key=attrgetter('date'), reverse=True)
dates = [article for article in self.dates if article in articles] dates = [article for article in self.dates if article in articles]
write(tag.save_as, tag_template, self.context, tag=tag, write(tag.save_as, tag_template, self.context, tag=tag,
articles=articles, dates=dates, articles=articles, dates=dates,
paginated={'articles': articles, 'dates': dates}, paginated={'articles': articles, 'dates': dates},
page_name=tag.page_name, all_articles=self.articles) page_name=tag.page_name, all_articles=self.articles)
def generate_categories(self, write): def generate_categories(self, write):
"""Generate category pages.""" """Generate category pages."""
@ -344,9 +346,9 @@ class ArticlesGenerator(Generator):
articles.sort(key=attrgetter('date'), reverse=True) articles.sort(key=attrgetter('date'), reverse=True)
dates = [article for article in self.dates if article in articles] dates = [article for article in self.dates if article in articles]
write(cat.save_as, category_template, self.context, write(cat.save_as, category_template, self.context,
category=cat, articles=articles, dates=dates, category=cat, articles=articles, dates=dates,
paginated={'articles': articles, 'dates': dates}, paginated={'articles': articles, 'dates': dates},
page_name=cat.page_name, all_articles=self.articles) page_name=cat.page_name, all_articles=self.articles)
def generate_authors(self, write): def generate_authors(self, write):
"""Generate Author pages.""" """Generate Author pages."""
@ -355,17 +357,17 @@ class ArticlesGenerator(Generator):
articles.sort(key=attrgetter('date'), reverse=True) articles.sort(key=attrgetter('date'), reverse=True)
dates = [article for article in self.dates if article in articles] dates = [article for article in self.dates if article in articles]
write(aut.save_as, author_template, self.context, write(aut.save_as, author_template, self.context,
author=aut, articles=articles, dates=dates, author=aut, articles=articles, dates=dates,
paginated={'articles': articles, 'dates': dates}, paginated={'articles': articles, 'dates': dates},
page_name=aut.page_name, all_articles=self.articles) page_name=aut.page_name, all_articles=self.articles)
def generate_drafts(self, write): def generate_drafts(self, write):
"""Generate drafts pages.""" """Generate drafts pages."""
for article in self.drafts: for article in self.drafts:
write(os.path.join('drafts', '%s.html' % article.slug), write(os.path.join('drafts', '%s.html' % article.slug),
self.get_template(article.template), self.context, self.get_template(article.template), self.context,
article=article, category=article.category, article=article, category=article.category,
all_articles=self.articles) all_articles=self.articles)
def generate_pages(self, writer): def generate_pages(self, writer):
"""Generate the pages on the disk""" """Generate the pages on the disk"""
@ -430,12 +432,11 @@ 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)
self.dates.sort(key=attrgetter('date'), self.dates.sort(key=attrgetter('date'),
reverse=self.context['NEWEST_FIRST_ARCHIVES']) reverse=self.context['NEWEST_FIRST_ARCHIVES'])
# create tag cloud # create tag cloud
tag_cloud = defaultdict(int) tag_cloud = defaultdict(int)
@ -468,7 +469,7 @@ class ArticlesGenerator(Generator):
# order the categories per name # order the categories per name
self.categories = list(self.categories.items()) self.categories = list(self.categories.items())
self.categories.sort( self.categories.sort(
reverse=self.settings['REVERSE_CATEGORY_ORDER']) reverse=self.settings['REVERSE_CATEGORY_ORDER'])
self.authors = list(self.authors.items()) self.authors = list(self.authors.items())
self.authors.sort() self.authors.sort()
@ -527,7 +528,7 @@ class PagesGenerator(Generator):
self.pages, self.translations = process_translations(all_pages) self.pages, self.translations = process_translations(all_pages)
self.hidden_pages, self.hidden_translations = ( self.hidden_pages, self.hidden_translations = (
process_translations(hidden_pages)) process_translations(hidden_pages))
self._update_context(('pages', )) self._update_context(('pages', ))
self.context['PAGES'] = self.pages self.context['PAGES'] = self.pages
@ -536,11 +537,12 @@ 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(
self.context, page=page, page.save_as, self.get_template(page.template),
relative_urls=self.settings['RELATIVE_URLS'], self.context, page=page,
override_output=hasattr(page, 'override_save_as')) relative_urls=self.settings['RELATIVE_URLS'],
override_output=hasattr(page, 'override_save_as'))
class StaticGenerator(Generator): class StaticGenerator(Generator):
@ -548,7 +550,7 @@ class StaticGenerator(Generator):
to output""" to output"""
def _copy_paths(self, paths, source, destination, output_path, def _copy_paths(self, paths, source, destination, output_path,
final_path=None): final_path=None):
"""Copy all the paths from source to destination""" """Copy all the paths from source to destination"""
for path in paths: for path in paths:
copy(path, source, os.path.join(output_path, destination), copy(path, source, os.path.join(output_path, destination),
@ -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']

19
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):
@ -66,7 +67,7 @@ class Writer(object):
if filename in self._overridden_files: if filename in self._overridden_files:
if override: if override:
raise RuntimeError('File %s is set to be overridden twice' raise RuntimeError('File %s is set to be overridden twice'
% filename) % filename)
else: else:
logger.info('skipping %s' % filename) logger.info('skipping %s' % filename)
filename = os.devnull filename = os.devnull
@ -124,7 +125,7 @@ class Writer(object):
locale.setlocale(locale.LC_ALL, old_locale) locale.setlocale(locale.LC_ALL, old_locale)
def write_file(self, name, template, context, relative_urls=False, def write_file(self, name, template, context, relative_urls=False,
paginated=None, override_output=False, **kwargs): paginated=None, override_output=False, **kwargs):
"""Render the template and write the file. """Render the template and write the file.
:param name: name of the file to output :param name: name of the file to output
@ -198,15 +199,15 @@ class Writer(object):
for key in paginators.keys(): for key in paginators.keys():
paginator = paginators[key] paginator = paginators[key]
previous_page = paginator.page(page_num) \ previous_page = paginator.page(page_num) \
if page_num > 0 else None if page_num > 0 else None
page = paginator.page(page_num + 1) page = paginator.page(page_num + 1)
next_page = paginator.page(page_num + 2) \ next_page = paginator.page(page_num + 2) \
if page_num + 1 < paginator.num_pages else None if page_num + 1 < paginator.num_pages else None
paginated_localcontext.update( paginated_localcontext.update(
{'%s_paginator' % key: paginator, {'%s_paginator' % key: paginator,
'%s_page' % key: page, '%s_page' % key: page,
'%s_previous_page' % key: previous_page, '%s_previous_page' % key: previous_page,
'%s_next_page' % key: next_page}) '%s_next_page' % key: next_page})
_write_file(template, paginated_localcontext, self.output_path, _write_file(template, paginated_localcontext, self.output_path,
page.save_as, override_output) page.save_as, override_output)