From 4a63695ae2cc871bd2849bc718b7bb2dfc6bc44c Mon Sep 17 00:00:00 2001 From: nfletton Date: Sat, 9 Feb 2013 17:23:59 -0700 Subject: [PATCH] Fixed pagination link error when _SAVE_AS setting used. The unit test for this scenario was passing as it was testing for an incorrect 'page_name' variable being set. --- pelican/generators.py | 4 ++-- tests/test_generators.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pelican/generators.py b/pelican/generators.py index ede0b7b3..e3ebf994 100644 --- a/pelican/generators.py +++ b/pelican/generators.py @@ -259,8 +259,8 @@ class ArticlesGenerator(Generator): continue write(save_as, self.get_template(template), - self.context, blog=True, paginated=paginated, - page_name=template) + self.context, blog=True, paginated=paginated, + page_name=os.path.splitext(save_as)[0]) def generate_tags(self, write): """Generate Tags pages.""" diff --git a/tests/test_generators.py b/tests/test_generators.py index 7a6e67fb..48c7bf91 100644 --- a/tests/test_generators.py +++ b/tests/test_generators.py @@ -140,7 +140,7 @@ class TestArticlesGenerator(unittest.TestCase): generator.generate_direct_templates(write) write.assert_called_with("archives/index.html", generator.get_template("archives"), settings, - blog=True, paginated={}, page_name='archives') + blog=True, paginated={}, page_name='archives/index') def test_direct_templates_save_as_false(self):