[Reportbug-commits] r662 - in trunk (debian/changelog reportbug/ui/text_ui.py)

[morph at users.alioth.debian.org]

    Date: Thursday, November 6, 2008 @ 17:00:17
  Author: morph
Revision: 662

merging v3.46 changes into v3.99.x codepath

Modified:
  trunk/debian/changelog
  trunk/reportbug/ui/text_ui.py

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-11-02 13:00:52 UTC (rev 661)
+++ trunk/debian/changelog	2008-11-06 17:00:17 UTC (rev 662)
@@ -61,6 +61,17 @@
 
  -- Sandro Tosi <morph at debian.org>  Thu, 23 Oct 2008 16:04:28 +0200
 
+reportbug (3.46) unstable; urgency=low
+
+  * debian/control
+    - updated my email address
+  * reportbuglib/reportbug_ui_text.py
+    - convert BTS output from UTF-8 to local encoding; thanks to Mark Hobley,
+      Gregor Herrmann and Klaus Ethgen for the bug reports and to Vincent
+      Fourmond for the patch; Closes: #497641, #496159, #504005
+
+ -- Sandro Tosi <morph at debian.org>  Sun, 02 Nov 2008 12:54:33 +0100
+
 reportbug (3.45) unstable; urgency=low
 
   * reportbuglib/reportbug_ui_urwid.py

Modified: trunk/reportbug/ui/text_ui.py
===================================================================
--- trunk/reportbug/ui/text_ui.py	2008-11-02 13:00:52 UTC (rev 661)
+++ trunk/reportbug/ui/text_ui.py	2008-11-06 17:00:17 UTC (rev 662)
@@ -30,6 +30,7 @@
 import glob
 import getpass
 import textwrap
+import locale
 try:
     import readline
 except ImportError:
@@ -582,7 +583,8 @@
                     helptext['n'] = helptext['n'][:-1]+' (skip to Next page).'
 
                 while 1:
-                    sys.stderr.writelines(lastpage)
+                    for line in lastpage:
+                        sys.stderr.write(line.decode('utf-8').encode(output_encoding, "replace"))
                     x = select_options(pstr, options, helptext,
                                        allow_numbers=allowed)
                     if x == 'n':