Ticket #17714: 17714_markdown_extensions_multiple_options_with_tests.diff

django/contrib/markup/tests.py

@@ -30 +30 @@
 
 ## An h2"""
 
+    markdown_content_with_def_list = """Paragraph 1
+
+## An h2
+
+Apple
+:   Pomaceous fruit of plants of the genus Malus in the family Rosaceae.
+
+Orange
+:   The fruit of an evergreen tree of the genus Citrus."""
+
     rest_content = """Paragraph 1
 
 Paragraph 2 with a link_
@@ -64 +74 @@
         rendered = t.render(Context({'markdown_content':self.markdown_content})).strip()
         self.assertEqual(rendered, self.markdown_content)
 
+    @unittest.skipUnless(markdown, 'markdown not installed')
+    def test_markdown_extensions(self):
+        # Define extensions to use as argument to markdown filter. Using
+        # def_list and headerid here because they are included in the standard
+        # Markdown library.
+        extensions = "def_list,headerid(forceid=False, level=3)"
+        t = Template(
+            """{%% load markup %%}"""
+            """{{ markdown_content|markdown:"%s" }}""" % extensions
+        )
+        c = Context({'markdown_content': self.markdown_content_with_def_list})
+        rendered = t.render(c)
+        
+        # Note that the output should have <h4> and <dl> now
+        pattern = re.compile(
+            r"""\s*<p>Paragraph 1</p>"""
+            """\s*<h4>An h2</h4>"""
+            """\s*<dl>"""
+            """\s*<dt>Apple</dt>"""
+            """\s*<dd>.*?Malus.*?</dd>"""
+            """\s*<dt>Orange</dt>"""
+            """\s*<dd>.*?Citrus.</dd>"""
+            """\s*</dl>""")
+        self.assertTrue(pattern.match(rendered))
+
     @unittest.skipUnless(docutils, 'docutils not installed')
     def test_docutils(self):
         t = Template("{% load markup %}{{ rest_content|restructuredtext }}")

django/contrib/markup/templatetags/markup.py

@@ -43 +43 @@
     generated by actual Markdown syntax, pass "safe" as the first
     extension in the list.
 
+    Extensions may be given configuration options in the form of key=value
+    pairs, separated by commas and enclosed in parenthesis immediately after
+    the extension name. For example:
+
+        {{ value|markdown:"ext_name(key1=val1, key2=val2),ext2,ext3,..." }}
+
     If the version of Markdown in use does not support extensions,
     they will be silently ignored.
 
@@ -57 +63 @@
         # markdown.version was first added in 1.6b. The only version of markdown
         # to fully support extensions before 1.6b was the shortlived 1.6a.
         if hasattr(markdown, 'version'):
-            extensions = [e for e in arg.split(",") if e]
+            extensions = []
+            # Ensure that splitting into extensions by commas ignores those
+            # commas contained within parenthesis, so that extensions are
+            # allowed multiple configuration options. 
+            for part in arg.split("("):
+                if ")" in part and extensions:
+                    config, part = part.split(")")
+                    extensions[-1] += "(%s)" % config
+                extensions.extend(e for e in part.split(",") if e)
+
             if len(extensions) > 0 and extensions[0] == "safe":
                 extensions = extensions[1:]
                 safe_mode = True