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

Merge branch 'pr/555'

Browse source 
Conflicts:
	pelican/contents.py
This commit is contained in:
Bruno Binet 2012-11-13 01:23:31 +01:00
commit c787e02dcc
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pelican/contents.py
View file

@ -53,11 +53,6 @@ class Page(object):
if not hasattr(self, 'author'): if not hasattr(self, 'author'):
if 'AUTHOR' in settings: if 'AUTHOR' in settings:
self.author = Author(settings['AUTHOR'], settings) self.author = Author(settings['AUTHOR'], settings)
else:
title = filename.decode('utf-8') if filename else self.title
self.author = Author(getenv('USER', 'John Doe'), settings)
logger.warning(u"Author of `{0}' unknown, assuming that his name is "
"`{1}'".format(title, self.author))
# manage languages # manage languages
self.in_default_lang = True self.in_default_lang = True
@ -120,7 +115,7 @@ class Page(object):
'slug': getattr(self, 'slug', ''), 'slug': getattr(self, 'slug', ''),
'lang': getattr(self, 'lang', 'en'), 'lang': getattr(self, 'lang', 'en'),
'date': getattr(self, 'date', datetime.now()), 'date': getattr(self, 'date', datetime.now()),
'author': self.author, 'author': getattr(self, 'author', ''),
'category': getattr(self, 'category', 'category': getattr(self, 'category',
self.settings['DEFAULT_CATEGORY']), self.settings['DEFAULT_CATEGORY']),
} }

4
pelican/generators.py
View file

@ -358,7 +358,9 @@ class ArticlesGenerator(Generator):
for article in self.articles: for article in self.articles:
# only main articles are listed in categories, not translations # only main articles are listed in categories, not translations
self.categories[article.category].append(article) self.categories[article.category].append(article)
self.authors[article.author].append(article) # ignore blank authors as well as undefined
if hasattr(article,'author') and article.author.name != '':
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)

2
pelican/writers.py
View file

@ -43,7 +43,7 @@ class Writer(object):
item.date.date(), item.url), item.date.date(), item.url),
description=item.content, description=item.content,
categories=item.tags if hasattr(item, 'tags') else None, categories=item.tags if hasattr(item, 'tags') else None,
author_name=getattr(item, 'author', 'John Doe'), author_name=getattr(item, 'author', ''),
pubdate=set_date_tzinfo(item.date, pubdate=set_date_tzinfo(item.date,
self.settings.get('TIMEZONE', None))) self.settings.get('TIMEZONE', None)))

7
tests/test_contents.py
View file

@ -40,8 +40,11 @@ class TestPage(unittest.TestCase):
def test_mandatory_properties(self): def test_mandatory_properties(self):
"""If the title is not set, must throw an exception.""" """If the title is not set, must throw an exception."""
self.assertRaises(AttributeError, Page, 'content') page = Page('content')
page = Page(**self.page_kwargs) with self.assertRaises(NameError) as cm:
page.check_properties()
page = Page('content', metadata={'title': 'foobar'})
page.check_properties() page.check_properties()
def test_summary_from_metadata(self): def test_summary_from_metadata(self):