Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.3.X] Fixed #17908 -- Made some `contrib.markup` tests be skipped s…

…o they don't fail on old versions of Markdown. Thanks to Preston Holmes for the patch.

Backport of r17749 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@17750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 2f6b8482f6a1117ac51efec675a7362f9b450349 1 parent 838adb2
@jphalip jphalip authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 django/contrib/markup/tests.py
View
6 django/contrib/markup/tests.py
@@ -14,6 +14,7 @@
try:
import markdown
+ markdown_version = getattr(markdown, "version_info", 0)
except ImportError:
markdown = None
@@ -38,7 +39,6 @@ class Templates(unittest.TestCase):
.. _link: http://www.example.com/"""
-
@unittest.skipUnless(textile, 'texttile not installed')
def test_textile(self):
t = Template("{{ textile_content|textile }}")
@@ -60,14 +60,14 @@ def test_markdown(self):
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_version >= (2,1), 'markdown >= 2.1 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_version >= (2,1), 'markdown >= 2.1 not installed')
def test_markdown_attribute_enable(self):
t = Template("{% load markup %}{{ markdown_content|markdown }}")
markdown_content = "{@onclick=alert('hi')}some paragraph"
Please sign in to comment.
Something went wrong with that request. Please try again.