Merge branch 'develop'

.gitignore

@@ -8,4 +8,3 @@
 /MANIFEST
 /venv
 build/
-.vscode/settings.json

markdownify/__init__.py

@@ -76,7 +76,6 @@ class MarkdownConverter(object):
         strong_em_symbol = ASTERISK
         sub_symbol = ''
         sup_symbol = ''
-        code_language = ''
 
     class Options(DefaultOptions):
         pass
@@ -315,7 +314,7 @@ class MarkdownConverter(object):
                 el = el.parent
             bullets = self.options['bullets']
             bullet = bullets[depth % len(bullets)]
-        return '%s %s\n' % (bullet, (text or '').strip())
+        return '%s %s\n' % (bullet, text or '')
 
     def convert_p(self, el, text, convert_as_inline):
         if convert_as_inline:
@@ -325,7 +324,7 @@ class MarkdownConverter(object):
     def convert_pre(self, el, text, convert_as_inline):
         if not text:
             return ''
-        return '\n```%s\n%s\n```\n' % (self.options['code_language'], text)
+        return '\n```\n%s\n```\n' % text
 
     convert_s = convert_del
 

setup.py

@@ -10,7 +10,7 @@ read = lambda filepath: codecs.open(filepath, 'r', 'utf-8').read()
 pkgmeta = {
     '__title__': 'markdownify',
     '__author__': 'Matthew Tretter',
-    '__version__': '0.9.4',
+    '__version__': '0.9.3',
 }
 
 

tests/test_conversions.py

@@ -210,8 +210,3 @@ def test_sub():
 def test_sup():
     assert md('<sup>foo</sup>') == 'foo'
     assert md('<sup>foo</sup>', sup_symbol='^') == '^foo^'
-
-
-def test_lang():
-    assert md('<pre>test\n    foo\nbar</pre>', code_language='python') == '\n```python\ntest\n    foo\nbar\n```\n'
-    assert md('<pre><code>test\n    foo\nbar</code></pre>', code_language='javascript') == '\n```javascript\ntest\n    foo\nbar\n```\n'

tests/test_lists.py

@@ -51,14 +51,6 @@ def test_nested_ols():
 
 def test_ul():
     assert md('<ul><li>a</li><li>b</li></ul>') == '* a\n* b\n'
-    assert md("""<ul>
-     <li>
-             a
-     </li>
-     <li> b </li>
-     <li>   c
-     </li>
- </ul>""") == '* a\n* b\n* c\n'
 
 
 def test_inline_ul():