Merge tag 'upstream/7.8.1'

Upstream version 7.8.1

# gpg: Firmado el mar 15 nov 2016 14:18:48 ART
# gpg:                usando RSA clave A6C7B88B9583046A11C5403E0B00FB6CEBE2D002
# gpg: Firma correcta de "Ulises Vitulli <dererk@debian.org>" [absoluta]
# gpg:                 alias "Dererk <dererk@torproject.org>" [absoluta]
# gpg:                 alias "Ulises Vitulli <uvitulli@fi.uba.ar>" [absoluta]
# gpg:                 alias "Ulises Vitulli <dererk@satellogic.com>" [absoluta]

1 files changed, 4 insertions, 40 deletions

diff --git a/tests/test_compile_markdown.py b/tests/test_compile_markdown.py
index 47cbdbb..99f44fd 100644
--- a/tests/test_compile_markdown.py
+++ b/tests/test_compile_markdown.py
@@ -52,7 +52,7 @@ class CompileMarkdownTests(BaseTestCase):
         expected_output = '''\
 <table class="codehilitetable"><tr><td class="linenos">\
 <div class="linenodiv"><pre>1</pre></div>\
-</td><td class="code"><pre class="code literal-block">\
+</td><td class="code"><pre class="code literal-block"><span></span>\
 <span class="kn">from</span> <span class="nn">this</span>
 </pre>
 </td></tr></table>
@@ -61,48 +61,12 @@ class CompileMarkdownTests(BaseTestCase):
         actual_output = self.compile(input_str)
         self.assertEquals(actual_output.strip(), expected_output.strip())
 
-    def test_compile_html_gist(self):
-        input_str = '''\
-Here's a gist file inline:
-[:gist: 4747847 zen.py]
+    def test_compile_strikethrough(self):
+        input_str = '~~striked out text~~'
+        expected_output = '<p><del>striked out text</del></p>'
 
-Cool, eh?
-'''
-        expected_output = '''\
-<p>Here's a gist file inline:
-<div class="gist">
-<script src="https://gist.github.com/4747847.js?file=zen.py"></script>
-<noscript>
-<pre>import this</pre>
-</noscript>
-</div>
-</p>
-<p>Cool, eh?</p>
-'''
         actual_output = self.compile(input_str)
         self.assertEquals(actual_output.strip(), expected_output.strip())
 
-    def test_compile_html_gist_2(self):
-        input_str = '''\
-Here's a gist file inline, using reStructuredText syntax:
-..gist:: 4747847 zen.py
-
-Cool, eh?
-'''
-        expected_output = '''\
-<p>Here's a gist file inline, using reStructuredText syntax:
-<div class="gist">
-<script src="https://gist.github.com/4747847.js?file=zen.py"></script>
-<noscript>
-<pre>import this</pre>
-</noscript>
-</div>
-</p>
-<p>Cool, eh?</p>
-'''
-        actual_output = self.compile(input_str)
-        self.assertEquals(actual_output.strip(), expected_output.strip())
-
-
 if __name__ == '__main__':
     unittest.main()