From 515847fdd24a952af4f858b05e6a9aebcf8d056f Mon Sep 17 00:00:00 2001 From: Zoresvit Date: Thu, 16 Aug 2012 14:17:46 +0300 Subject: [PATCH 1/2] Include index in format() string. Argument index is included in .format() method format string in order to be friendly with various Python versions and consistent with the rest of the code. --- pelican/tools/pelican_import.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py index dab3c3a8..b6437c92 100755 --- a/pelican/tools/pelican_import.py +++ b/pelican/tools/pelican_import.py @@ -233,7 +233,7 @@ def fields2pelican(fields, out_markup, output_path, dircat=False, strip_raw=Fals # Replace newlines with paragraphs wrapped with

so # HTML is valid before conversion paragraphs = content.split('\n\n') - paragraphs = [u'

{}

'.format(p) for p in paragraphs] + paragraphs = [u'

{0}

'.format(p) for p in paragraphs] new_content = ''.join(paragraphs) fp.write(new_content) From 892761f73222233777b90da9634bacc95001ad93 Mon Sep 17 00:00:00 2001 From: Zoresvit Date: Thu, 16 Aug 2012 14:19:10 +0300 Subject: [PATCH 2/2] Fixed description of copying themes/static content. The content from `static` directory is actually copied into `theme/`, not `theme/static/`. --- docs/themes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/themes.rst b/docs/themes.rst index 25cdd682..d3dd4d9e 100644 --- a/docs/themes.rst +++ b/docs/themes.rst @@ -29,7 +29,7 @@ To make your own theme, you must follow the following structure:: └── tags.html // must list all the tags. Can be a tag cloud. * `static` contains all the static assets, which will be copied to the output - `theme/static` folder. I've put the CSS and image folders here, but they are + `theme` folder. I've put the CSS and image folders here, but they are just examples. Put what you need here. * `templates` contains all the templates that will be used to generate the content.