New markdown2 release changed output with code highlighting (take 2)

code highight div generated/used by pygments is on a separate line in
2.4.4 release of markdown2.

python 2.7 still needs expected form without additonal newlines as
2.4.4 is python3 only.

Author: rouilj

test/test_templating.py

@@ -854,6 +854,10 @@ def test_string_markdown_code_block(self):
         self.assertEqual(p.markdown().strip().replace('\n\n', '\n'), u2s(u'<p>embedded code block &lt;pre&gt;</p>\n<pre><code>line 1\nline 2\n</code></pre>\n<p>new &lt;/pre&gt; paragraph</p>'))
 
     def test_string_markdown_code_block_attribute(self):
+        import sys
+
+        _py3 = sys.version_info[0] > 2
+
         ''' also verify that embedded html is escaped '''
         p = StringHTMLProperty(self.client, 'test', '1', None, 'test', u2s(u'embedded code block <pre>\n\n``` python\nline 1\nline 2\n```\n\nnew </pre> paragraph'))
         m = p.markdown().strip()
@@ -864,7 +868,11 @@ def test_string_markdown_code_block_attribute(self):
             self.assertEqual(m.replace('\n\n','\n'), '<p>embedded code block &lt;pre&gt;</p>\n<pre><code class="language-python">line 1\nline 2\n</code></pre>\n<p>new &lt;/pre&gt; paragraph</p>')
         else:
             test_output = m.replace('\n\n', '\n')
-            expected_result = '<p>embedded code block &lt;pre&gt;</p>\n<div class="codehilite">\n<pre><span></span><code><span class="n">line</span> <span class="mi">1</span>\n<span class="n">line</span> <span class="mi">2</span>\n</code></pre>\n</div>\n<p>new &lt;/pre&gt; paragraph</p>'
+            if _py3:
+                nl = "\n"
+            else:
+                nl = ""
+            expected_result = '<p>embedded code block &lt;pre&gt;</p>\n<div class="codehilite">%(nl)s<pre><span></span><code><span class="n">line</span> <span class="mi">1</span>\n<span class="n">line</span> <span class="mi">2</span>\n</code></pre>%(nl)s</div>\n<p>new &lt;/pre&gt; paragraph</p>' % { 'nl': nl }
             if  test_output != expected_result:
                 print("test_output:", test_output)
                 print("expected_result:", expected_result)