Ticket #17908: markdown-test-fix.diff

django/contrib/markup/tests.py

@@ -12 +12 @@
 
 try:
     import markdown
+    markdown_vers = getattr(markdown, "version_info", 0)
 except ImportError:
     markdown = None
 
@@ -36 +37 @@
 
 .. _link: http://www.example.com/"""
 
-
     @unittest.skipUnless(textile, 'texttile not installed')
     def test_textile(self):
         t = Template("{% load markup %}{{ textile_content|textile }}")
@@ -58 +58 @@
         pattern = re.compile("""<p>Paragraph 1\s*</p>\s*<h2>\s*An h2</h2>""")
         self.assertTrue(pattern.match(rendered))
 
-    @unittest.skipUnless(markdown, 'markdown no installed')
+    @unittest.skipUnless(markdown and markdown_vers >= (2,1), 'markdown not installed')
     def test_markdown_attribute_disable(self):
         t = Template("{% load markup %}{{ markdown_content|markdown:'safe' }}")
         markdown_content = "{@onclick=alert('hi')}some paragraph"
         rendered = t.render(Context({'markdown_content':markdown_content})).strip()
         self.assertTrue('@' in rendered)
 
-    @unittest.skipUnless(markdown, 'markdown no installed')
+    @unittest.skipUnless(markdown and markdown_vers >= (2,1), 'markdown not installed')
     def test_markdown_attribute_enable(self):
         t = Template("{% load markup %}{{ markdown_content|markdown }}")
         markdown_content = "{@onclick=alert('hi')}some paragraph"