From 62238a0078d63affdbb5641cc1988e9a438f04c3 Mon Sep 17 00:00:00 2001 From: Alexis Metaireau Date: Sun, 17 Oct 2010 06:35:49 +0100 Subject: [PATCH] Order the categories before outputing them. --- pelican/bloggenerator.py | 12 ++++++------ setup.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pelican/bloggenerator.py b/pelican/bloggenerator.py index ef2bc6b1..d09de155 100644 --- a/pelican/bloggenerator.py +++ b/pelican/bloggenerator.py @@ -105,6 +105,12 @@ def generate_blog(path=None, theme=None, output_path=None, markup=None, if 'BLOGURL' not in context: context['BLOGURL'] = output_path + generate_feed(articles, context, output_path, context['FEED']) + for cat, arts in categories.items(): + arts.sort(key=attrgetter('date'), reverse=True) + generate_feed(arts, context, output_path, + context['CATEGORY_FEED'] % cat) + # generate the output generate = partial(generate_file, output_path) for template in _DIRECT_TEMPLATES: @@ -118,12 +124,6 @@ def generate_blog(path=None, theme=None, output_path=None, markup=None, generate('%s' % article.url, templates['article'], context, article=article) - generate_feed(articles, context, output_path, context['FEED']) - for category, articles in categories.items(): - articles.sort(key=attrgetter('date'), reverse=True) - generate_feed(articles, context, output_path, - context['CATEGORY_FEED'] % category) - # copy static paths to output for path in context['STATIC_PATHS']: try: diff --git a/setup.py b/setup.py index 4fcf61f1..cb7e049d 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ if sys.version_info < (2,7): setup( name = "pelican", - version = '1.2.3', + version = '1.2.4', url = 'http://hg.lolnet.org/pelican/', author = 'Alexis Metaireau', author_email = 'alexis@notmyidea.org',