Merge branch 'master' of https://github.com/waylan/Python-Markdown

Author: waylan

docs/reference.txt

@@ -247,8 +247,8 @@ The following options are available on the `markdown.markdown` function:
     If `lazy_ol` is set to `False`, then markdown will output the following
     HTML:
 
-        <ol>
-          <li start="4">Apples</li>
+        <ol start="4">
+          <li>Apples</li>
           <li>Oranges</li>
           <li>Pears</li>
         </ol>

markdown/extensions/fenced_code.py

@@ -81,6 +81,7 @@ def run(self, lines):
                         guess_lang=self.codehilite_conf['guess_lang'][0],
                         css_class=self.codehilite_conf['css_class'][0],
                         style=self.codehilite_conf['pygments_style'][0],
+                        use_pygments=self.codehilite_conf['use_pygments'][0],
                         lang=(m.group('lang') or None),
                         noclasses=self.codehilite_conf['noclasses'][0],
                         hl_lines=parse_hl_lines(m.group('hl_lines'))

tests/test_extensions.py

@@ -375,6 +375,18 @@ def testFencedLanguageAndHighlightLines(self):
                     '#line 3</code></pre>'
                 )
 
+    def testFencedLanguageAndPygmentsDisabled(self):
+        """ Test if fenced_code honors CodeHilite option use_pygments=False. """
+
+        text = '```python\nfrom __future__ import braces\n```'
+        md = markdown.Markdown(
+            extensions=[
+                markdown.extensions.codehilite.CodeHiliteExtension(use_pygments=False),
+                'markdown.extensions.fenced_code'
+            ]
+        )
+        self.assertTrue('<code class="language-python">' in md.convert(text))
+
 
 class TestHeaderId(unittest.TestCase):
     """ Test HeaderId Extension. """