fixed ReStructuredText encoding with Python 3

Author: cmeerw

.travis.yml

@@ -93,6 +93,7 @@ install:
   - pip install psycopg2
   - pip install gpg pytz whoosh pyjwt
   - pip install pytest-cov codecov
+  - if [[ $TRAVIS_PYTHON_VERSION != "3.4"* ]]; then pip install docutils; fi
 
 before_script:
   # set up mysql database

CHANGES.txt

@@ -103,6 +103,7 @@ Fixed:
 - issue2551051: Return a 403 on non-existing or non-searchable
   transitive properties when queried via REST-API (same behavior for
   sorting and searching).
+- Fixed ReStructuredText encoding with Python 3.
 
 2019-10-23 2.0.0 alpha 0
 

roundup/cgi/templating.py

@@ -1599,8 +1599,7 @@ def rst(self, hyperlink=1):
         s = self.plain(escape=0, hyperlink=0)
         if hyperlink:
             s = self.hyper_re.sub(self._hyper_repl_rst, s)
-        return ReStructuredText(s, writer_name="html")["html_body"].encode("utf-8",
-            "replace")
+        return u2s(ReStructuredText(s, writer_name="html")["html_body"])
 
     def field(self, **kwargs):
         """ Render the property as a field in HTML.

test/test_templating.py

@@ -5,6 +5,13 @@
 from roundup.cgi.templating import *
 from .test_actions import MockNull, true
 
+try:
+    from docutils.core import publish_parts as ReStructuredText
+except ImportError:
+    ReStructuredText = None
+
+from roundup.anypy.strings import u2s, s2u
+
 class MockDatabase(MockNull):
     def getclass(self, name):
         return self.classes[name]
@@ -210,6 +217,13 @@ def test_string_plain_or_hyperlinked(self):
 
         self.assertEqual(p.hyperlinked(), 'A string &lt;b&gt; with <a href="mailto:[email protected]">[email protected]</a> embedded &amp;lt; html&lt;/b&gt;')
 
+    def test_string_rst(self):
+        p = StringHTMLProperty(self.client, 'test', '1', None, 'test', u2s(u'A string with [email protected] *embedded* \u00df'))
+        if ReStructuredText:
+            self.assertEqual(p.rst(), u2s(u'<div class="document">\n<p>A string with <a class="reference external" href="mailto:cmeerw&#64;example.com">cmeerw&#64;example.com</a> <em>embedded</em> \u00df</p>\n</div>\n'))
+        else:
+            self.assertEqual(p.rst(), u2s(u'A string with <a href="mailto:[email protected]">[email protected]</a> *embedded* \u00df'))
+
     def test_string_field(self):
         p = StringHTMLProperty(self.client, 'test', '1', None, 'test', 'A string <b> with [email protected] embedded &lt; html</b>')
         self.assertEqual(p.field(), '<input name="test1@test" size="30" type="text" value="A string &lt;b&gt; with [email protected] embedded &amp;lt; html&lt;/b&gt;">')