Author: julien
Date: 2012-03-15 17:38:18 -0700 (Thu, 15 Mar 2012)
New Revision: 17750
Modified:
django/branches/releases/1.3.X/django/contrib/markup/tests.py
Log:
[1.3.X] Fixed #17908 -- Made some `contrib.markup` tests be skipped so they
don't fail on old versions of Markdown. Thanks to Preston Holmes for the patch.
Backport of r17749 from trunk.
Modified: django/branches/releases/1.3.X/django/contrib/markup/tests.py
===================================================================
--- django/branches/releases/1.3.X/django/contrib/markup/tests.py
2012-03-16 00:36:52 UTC (rev 17749)
+++ django/branches/releases/1.3.X/django/contrib/markup/tests.py
2012-03-16 00:38:18 UTC (rev 17750)
@@ -14,6 +14,7 @@
try:
import markdown
+ markdown_version = getattr(markdown, "version_info", 0)
except ImportError:
markdown = None
@@ -38,7 +39,6 @@
.. _link: http://www.example.com/""";
-
@unittest.skipUnless(textile, 'texttile not installed')
def test_textile(self):
t = Template("{{ textile_content|textile }}")
@@ -60,14 +60,14 @@
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"
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
