# HG changeset patch # User Mads Kiilerich # Date 2017-10-16 03:06:20 # Node ID 52b6083b94e6ee43c0ab6306b9644d1fe1cccb3b # Parent 2c0e7e1d2584fb26bc6cd797fa56162211ebc6de lib: refactor detection of markup renderers Make it easier to spot which functions actually are used. diff --git a/kallithea/lib/markup_renderer.py b/kallithea/lib/markup_renderer.py --- a/kallithea/lib/markup_renderer.py +++ b/kallithea/lib/markup_renderer.py @@ -46,7 +46,7 @@ class MarkupRenderer(object): RST_PAT = re.compile(r're?st', re.IGNORECASE) PLAIN_PAT = re.compile(r'readme', re.IGNORECASE) - def _detect_renderer(self, source, filename=None): + def _detect_renderer(self, source, filename): """ runs detection of what renderer should be used for generating html from a markup language @@ -57,16 +57,13 @@ class MarkupRenderer(object): :param filename: """ - if MarkupRenderer.MARKDOWN_PAT.findall(filename): - detected_renderer = 'markdown' - elif MarkupRenderer.RST_PAT.findall(filename): - detected_renderer = 'rst' - elif MarkupRenderer.PLAIN_PAT.findall(filename): - detected_renderer = 'rst' - else: - detected_renderer = 'plain' - - return getattr(MarkupRenderer, detected_renderer) + if self.MARKDOWN_PAT.findall(filename): + return self.markdown + elif self.RST_PAT.findall(filename): + return self.rst + elif self.PLAIN_PAT.findall(filename): + return self.rst + return self.plain @classmethod def _flavored_markdown(cls, text):