Merge pull request #74 from Alir3z4/commonmark-0.8.1

Add commonmark 0.8.1 compatibility

Author: nikolas

ChangeLog.rst

@@ -1,3 +1,9 @@
+1.6.1
+================
+----
+
+* Add commonmark 0.8.1 compatibility
+
 1.6.0 2017-12-03
 ================
 ----

django_markwhat/templatetags/markup.py

@@ -11,7 +11,7 @@
 
     * reStructuredText, which requires docutils from http://docutils.sf.net/
 
-    * CommonMark, which requires CommonMark http://commonmark.org/
+    * CommonMark, which requires commonmark http://commonmark.org/
 """
 
 from django import template
@@ -78,7 +78,7 @@ def markdown(value, args=''):
 @register.filter(is_safe=True)
 def commonmark(value):
     """
-    Runs CommonMark over a given value.
+    Runs commonmark over a given value.
 
     Syntax::
 
@@ -88,10 +88,10 @@ def commonmark(value):
 
     :rtype: str
     """
-    import CommonMark
+    import commonmark
 
-    parser = CommonMark.Parser()
-    renderer = CommonMark.HtmlRenderer()
+    parser = commonmark.Parser()
+    renderer = commonmark.HtmlRenderer()
     ast = parser.parse(force_text(value))
     return mark_safe(
         force_text(renderer.render(ast))

django_markwhat/tests.py

@@ -18,9 +18,9 @@
     markdown = None
 
 try:
-    import CommonMark
+    import commonmark
 except ImportError:
-    CommonMark = None
+    commonmark = None
 
 try:
     import docutils
@@ -143,15 +143,15 @@ def test_no_markdown(self):
             {'markdown_content': self.markdown_content})).strip()
         self.assertEqual(rendered, self.markdown_content)
 
-    @unittest.skipUnless(CommonMark, 'commonmark not installed')
+    @unittest.skipUnless(commonmark, 'commonmark not installed')
     def test_commonmark(self):
         t = Template("{% load markup %}{{ markdown_content|commonmark }}")
         rendered = t.render(
             Context({'markdown_content': self.markdown_content})).strip()
         pattern = re.compile("""<p>Paragraph 1\s*</p>\s*<h2>\s*An h2</h2>""")
         self.assertTrue(pattern.match(rendered))
 
-    @unittest.skipUnless(CommonMark, 'commonmark not installed')
+    @unittest.skipUnless(commonmark, 'commonmark not installed')
     def test_commonmark_html_code(self):
         t = Template("{% load markup %}{{ markdown_content|commonmark }}")
         rendered = t.render(Context({
@@ -163,7 +163,7 @@ def test_commonmark_html_code(self):
         )
         self.assertTrue(pattern.match(rendered))
 
-    @unittest.skipUnless(CommonMark, 'commonmark not installed')
+    @unittest.skipUnless(commonmark, 'commonmark not installed')
     def test_commonmark_html_iframe_code(self):
         t = Template("{% load markup %}{{ markdown_content|commonmark }}")
         rendered = t.render(Context({
@@ -177,13 +177,13 @@ def test_commonmark_html_iframe_code(self):
         )
         self.assertTrue(pattern.match(rendered))
 
-    @unittest.skipUnless(CommonMark, 'commonmark not installed')
+    @unittest.skipUnless(commonmark, 'commonmark not installed')
     def test_commonmark_empty_str(self):
         t = Template("{% load markup %}{{ markdown_content|commonmark }}")
         rendered = t.render(Context({'markdown_content': ''})).strip()
         self.assertEqual(rendered, '')
 
-    @unittest.skipUnless(CommonMark, 'commonmark not installed')
+    @unittest.skipUnless(commonmark, 'commonmark not installed')
     def test_commonmark_none(self):
         t = Template("{% load markup %}{{ markdown_content|commonmark }}")
         rendered = t.render(Context({'markdown_content': None})).strip()

requirements/dev.txt

@@ -1,5 +1,5 @@
 Markdown==2.6.9
-CommonMark==0.7.4
+commonmark==0.8.1
 textile==3.0.0
 docutils==0.14
 flake8==3.5.0