From b3c968fa234f25e258ee9b86603af62074f6e79a Mon Sep 17 00:00:00 2001 From: liob Date: Wed, 27 Aug 2014 09:41:47 +0200 Subject: [PATCH] prettify code --- pandoc_reader.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pandoc_reader.py b/pandoc_reader.py index d567918..cade6b7 100644 --- a/pandoc_reader.py +++ b/pandoc_reader.py @@ -4,11 +4,11 @@ from pelican.readers import BaseReader from pelican.utils import pelican_open import pypandoc -class NewReader(BaseReader): + +class PandocReader(BaseReader): enabled = True file_extensions = ['md', 'markdown', 'mkd', 'mdown'] - def read(self, filename): with pelican_open(filename) as text: metadata_items = [] @@ -23,23 +23,21 @@ class NewReader(BaseReader): MD += line + '\n' metadata = {} - for item in metadata_items: - name, value = item + for name, value in metadata_items: name = name.lower() value = value.strip() - meta = self.process_metadata(name, value) - metadata[name] = meta + metadata[name] = self.process_metadata(name, value) os.chdir(self.settings['PATH']) # change the cwd to the content dir - if 'PANDOC_ARGS' in self.settings: - output = pypandoc.convert(MD, 'html5', format='md', extra_args=self.settings['PANDOC_ARGS']) - else: - output = pypandoc.convert(MD, 'html5', format='md') + if not 'PANDOC_ARGS' in self.settings: self.settings['PANDOC_ARGS'] = [] + output = pypandoc.convert(MD, 'html5', format='md', extra_args=self.settings['PANDOC_ARGS']) return output, metadata + def add_reader(readers): - readers.reader_classes['md'] = NewReader + readers.reader_classes['md'] = PandocReader + def register(): signals.readers_init.connect(add_reader)