Ticket #14449: markup-rest.diff

django/contrib/markup/templatetags/markup.py

@@ -83 +83 @@
     else:
         docutils_settings = getattr(settings, "RESTRUCTUREDTEXT_FILTER_SETTINGS", {})
         parts = publish_parts(source=smart_str(value), writer_name="html4css1", settings_overrides=docutils_settings)
-        return mark_safe(force_unicode(parts["fragment"]))
+        return mark_safe(force_unicode(parts["html_body"]))
 restructuredtext.is_safe = True
 
 register.filter(textile)

django/contrib/markup/tests.py

@@ -38 +38 @@
 
 .. _link: http://www.example.com/"""
 
+    rest_headline_content = """Headline
+========
+    
+This is text."""
+
 
     @unittest.skipUnless(textile, 'texttile not installed')
     def test_textile(self):
@@ -73 +78 @@
         # Different versions of docutils return slightly different HTML
         try:
             # Docutils v0.4 and earlier
-            self.assertEqual(rendered, """<p>Paragraph 1</p>
-<p>Paragraph 2 with a <a class="reference" href="http://www.example.com/">link</a></p>""")
+            self.assertEqual(rendered, """<div class="document">
+<p>Paragraph 1</p>
+<p>Paragraph 2 with a <a class="reference" href="http://www.example.com/">link</a></p>
+</div>""")
         except AssertionError, e:
             # Docutils from SVN (which will become 0.5)
-            self.assertEqual(rendered, """<p>Paragraph 1</p>
-<p>Paragraph 2 with a <a class="reference external" href="http://www.example.com/">link</a></p>""")
+            self.assertEqual(rendered, """<div class="document">
+<p>Paragraph 1</p>
+<p>Paragraph 2 with a <a class="reference external" href="http://www.example.com/">link</a></p>
+</div>""")
 
     @unittest.skipIf(docutils, 'docutils is installed')
     def test_no_docutils(self):
         t = Template("{{ rest_content|restructuredtext }}")
         rendered = t.render(Context({'rest_content':self.rest_content})).strip()
         self.assertEqual(rendered, self.rest_content)
-
+        
+    @unittest.skipUnless(docutils, 'docutils not installed')
+    def test_docutils_headline(self):
+        t = Template("{{ rest_content|restructuredtext }}")
+        rendered = t.render(Context({'rest_content': self.rest_headline_content})).strip()
+        self.assertEqual(rendered, """<div class="document" id="headline">
+<h1 class="title">Headline</h1>
+<p>This is text.</p>
+</div>""")
 
 if __name__ == '__main__':
     unittest.main()