Source inclusion of restructured text fails with encoding error

[anonymous]

Consider a restructured text file held in the project repository, correctly MIME typed.

Now include in a wiki page: [[Include(source:Project/branches/development/example.rst)]]

The result is:

Error: Macro Include(source:Project/branches/development/example.rst) failed
  
source returned bytes, but no encoding specified

[anonymous]

From investigating the error message it looks like this may well be due to a change in the Genshi library. See ​trac:wiki:TracDev/ApiChanges/1.0#Genshimandatory

[Ryan J Ollos]

The following patch seems to fix the issue:

trunk/includemacro/macros.py

@@ -20 +20 @@
 from trac.perm import IPermissionRequestor
 from trac.resource import ResourceNotFound
 from trac.ticket.model import Ticket
+from trac.util.text import to_unicode
 from trac.versioncontrol.api import NoSuchNode, RepositoryManager
 from trac.wiki.api import WikiSystem
 from trac.wiki.formatter import system_message
@@ -154 +155 @@
 
         # Escape if needed
         if not self.config.getbool('wiki', 'render_unsafe_content', False):
+            out = to_unicode(out)
             try:
                 out = HTMLParser(StringIO(out)).parse() | HTMLSanitizer()
             except ParseError:

[Ryan J Ollos]

In 14777:

3.0.0dev: Send unicode text to Genshi. Fixes #12422.

Genshi 0.7 accepts unicode by default.