From 5e84a44a45695e88a74569da41d2e808c23e280e Mon Sep 17 00:00:00 2001 From: Roberto Alsina Date: Sun, 18 Mar 2018 10:41:34 -0300 Subject: [PATCH] MAke tests pass --- nikola/plugins/compile/markdown/__init__.py | 8 +++++--- tests/base.py | 1 + tests/test_compile_markdown.py | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nikola/plugins/compile/markdown/__init__.py b/nikola/plugins/compile/markdown/__init__.py index c7ccca40e0..ee420cfa9d 100644 --- a/nikola/plugins/compile/markdown/__init__.py +++ b/nikola/plugins/compile/markdown/__init__.py @@ -92,17 +92,19 @@ def set_site(self, site): extensions.extend(site_extensions) site_extension_configs = self.site.config.get("MARKDOWN_EXTENSION_CONFIGS", {}) - self.config_dependencies.append(json.dumps(site_extension_configs.values, sort_keys=True)) + if site_extension_configs: + self.config_dependencies.append(json.dumps(site_extension_configs.values, sort_keys=True)) if Markdown is not None: self.converters = {} for lang in self.site.config['TRANSLATIONS']: - self.converters[lang] = ThreadLocalMarkdown(extensions, site_extension_configs[lang]) + self.converters[lang] = ThreadLocalMarkdown(extensions, site_extension_configs.get(lang, {})) self.supports_metadata = 'markdown.extensions.meta' in extensions def compile_string(self, data, source_path=None, is_two_file=True, post=None, lang=None): """Compile Markdown into HTML strings.""" - lang = lang or self.site.config.DEFAULT_LANGUAGE + if lang is None: + lang = LocaleBorg().current_lang if Markdown is None: req_missing(['markdown'], 'build this site (compile Markdown)') if not is_two_file: diff --git a/tests/base.py b/tests/base.py index 4e2830aff4..8fe0e2bacb 100644 --- a/tests/base.py +++ b/tests/base.py @@ -175,6 +175,7 @@ def __init__(self): 'MARKDOWN_EXTENSIONS': ['markdown.extensions.fenced_code', 'markdown.extensions.codehilite'], 'TRANSLATIONS_PATTERN': '{path}.{lang}.{ext}', 'LISTINGS_FOLDERS': {'listings': 'listings'}, + 'TRANSLATIONS': {'en': ''}, } self.EXTRA_PLUGINS = self.config['EXTRA_PLUGINS'] self.plugin_manager = PluginManager(categories_filter={ diff --git a/tests/test_compile_markdown.py b/tests/test_compile_markdown.py index e69629c9b7..7a4f21700f 100644 --- a/tests/test_compile_markdown.py +++ b/tests/test_compile_markdown.py @@ -23,7 +23,7 @@ def compile(self, input_string): with io.open(self.input_path, "w+", encoding="utf8") as input_file: input_file.write(input_string) - self.compiler.compile(self.input_path, self.output_path) + self.compiler.compile(self.input_path, self.output_path, lang='en') output_str = None with io.open(self.output_path, "r", encoding="utf8") as output_path: