From 964f7d96d6e505f8a6dea40cbdf7b8ab750abafc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= Date: Wed, 6 Mar 2013 11:46:17 -0800 Subject: [PATCH] endswith can take a list as an argument ;) --- pelican/generators.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pelican/generators.py b/pelican/generators.py index 30ac7884..d09bf676 100644 --- a/pelican/generators.py +++ b/pelican/generators.py @@ -94,8 +94,7 @@ class Generator(object): if extensions is None: extensions = self.markup basename = os.path.basename(path) - if extensions is False or \ - (True in [basename.endswith(ext) for ext in extensions]): + if extensions is False or basename.endswith(extensions): return True return False @@ -150,8 +149,8 @@ class _FileLoader(BaseLoader): mtime = os.path.getmtime(self.fullpath) with open(self.fullpath, 'r', encoding='utf-8') as f: source = f.read() - return source, self.fullpath, \ - lambda: mtime == os.path.getmtime(self.fullpath) + return (source, self.fullpath, + lambda: mtime == os.path.getmtime(self.fullpath)) class TemplatePagesGenerator(Generator): @@ -551,12 +550,14 @@ class PdfGenerator(Generator): super(PdfGenerator, self).__init__(*args, **kwargs) try: from rst2pdf.createpdf import RstToPdf - pdf_style_path = os.path.join(self.settings['PDF_STYLE_PATH']) \ - if 'PDF_STYLE_PATH' in self.settings.keys() \ - else '' - pdf_style = self.settings['PDF_STYLE'] if 'PDF_STYLE' \ - in self.settings.keys() \ - else 'twelvepoint' + if 'PDF_STYLE_PATH' in self.settings.keys(): + pdf_style_path = os.path.join(self.settings['PDF_STYLE_PATH']) + else: + pdf_style_path = '' + + if 'PDF_STYLE' in self.settings.keys(): + pdf_style = self.settings.get('PDF_STYLE', 'twelvepoint') + self.pdfcreator = RstToPdf(breakside=0, stylesheets=[pdf_style], style_path=[pdf_style_path])