changeset 6934:52b6083b94e6

lib: refactor detection of markup renderers Make it easier to spot which functions actually are used.
author Mads Kiilerich <mads@kiilerich.com>
date Mon, 16 Oct 2017 03:06:20 +0200
parents 2c0e7e1d2584
children ac7a406fd7f4
files kallithea/lib/markup_renderer.py
diffstat 1 files changed, 8 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/lib/markup_renderer.py	Wed Oct 11 02:41:07 2017 +0200
+++ b/kallithea/lib/markup_renderer.py	Mon Oct 16 03:06:20 2017 +0200
@@ -46,7 +46,7 @@
     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 @@
         :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):