changeset 5846:a1054c9e7aae

[bugfix] action/rss_rc.py: dealing with mixing unicode and non-unicode strings.
author Eugene Syromyatnikov <evgsyr@gmail.com>
date Thu, 17 May 2012 03:30:39 +0400
parents 0e1b4214318f
children 2191676ba6fe
files MoinMoin/action/rss_rc.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/rss_rc.py	Wed May 16 15:39:03 2012 +0400
+++ b/MoinMoin/action/rss_rc.py	Thu May 17 03:30:39 2012 +0400
@@ -159,7 +159,7 @@
 
         # start SAX stream
         handler.startDocument()
-        handler._out.write(
+        handler._out.write(unicode(
             '<!--\n'
             '    Add an "items=nnn" URL parameter to get more than the default %d items.\n'
             '    You cannot get more than %d items though.\n'
@@ -187,7 +187,7 @@
             '    lines=%i, show_att=%i, page=%s\n'
             '-->\n' % (def_max_items, items_limit, lines_limit, max_items,
                        unique, diffs, ddiffs, max_lines, show_att, page_pattern)
-            )
+            ).encode(config.charset))
 
         # emit channel description
         handler.startNode('channel', {