Changeset 11683

Timestamp:

Feb 11, 2013, 5:38:08 PM (13 years ago)

Author:

Christian Boos

Message:

1.0.2dev: Genshi 0.7 fix for wiki bracketed link .

Any page containing a <http://...> link produced a
global TracError:

Genshi UnicodeEncodeError error while rendering template (unknown template location)

The code was doing something like '...%s...' % Element() and the
Genshi builder Element contained a non-ascii character (ZWSP). In
Genshi 0.7, conversion to a str is now producing unicode, as the
default encoding parameter for Stream.render() is now None
(i.e. unicode).

Added a test case to catch this.

Location:

branches/1.0-stable/trac/wiki

Files:

• formatter.py (modified) (1 diff)
• tests/wiki-tests.txt (modified) (1 diff)

branches/1.0-stable/trac/wiki/formatter.py

@@ -576 +576 @@
         target = unquote_label(fullmatch.group('stgtbr'))
         match = match[1:-1]
-        return '<%s>' % \
+        return u'<%s>' % \
                 self._make_link(ns, target, match, match, fullmatch)
 

branches/1.0-stable/trac/wiki/tests/wiki-tests.txt

@@ -315 +315 @@
 <p>
 nolink:&#34;&lt;blink&gt;&#34;
+</p>
+------------------------------
+============================== Bracketed links
+See <http://en.wikipedia.org/wiki/Mornington_Crescent_(game)>
+------------------------------
+<p>
+See &lt;<a class="ext-link" href="http://en.wikipedia.org/wiki/Mornington_Crescent_(game)"><span class="icon"></span>http://en.wikipedia.org/wiki/Mornington_Crescent_(game)</a>&gt;
 </p>
 ------------------------------