[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 6.0-28-gccddf84

Sandro Tosi morph at debian.org
Thu Aug 25 22:07:42 UTC 2011


The following commit has been merged in the master branch:
commit ccddf848720184e1f60761a1ee699405e7f7ae80
Author: Sandro Tosi <morph at debian.org>
Date:   Fri Aug 26 00:04:36 2011 +0200

    don't try to decode a unicode string; thanks to Vincent Bernat for the report; Closes: #638429

diff --git a/debian/changelog b/debian/changelog
index c263a48..9fb3d85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,11 @@ reportbug (6.2) UNRELEASED; urgency=low
     - if can't write to the selected output file, then don't crash but just
       select a temporary file instead; thanks to David A. Parker for the report;
       Closes: #617636
+  * reportbug/ui/text_ui.py
+    - don't try to decode a unicode string; thanks to Vincent Bernat for the
+      report; Closes: #638429
 
- -- Sandro Tosi <morph at debian.org>  Thu, 25 Aug 2011 23:44:22 +0200
+ -- Sandro Tosi <morph at debian.org>  Fri, 26 Aug 2011 00:03:48 +0200
 
 reportbug (6.1) unstable; urgency=low
 
diff --git a/reportbug/ui/text_ui.py b/reportbug/ui/text_ui.py
index c820721..8896cd7 100644
--- a/reportbug/ui/text_ui.py
+++ b/reportbug/ui/text_ui.py
@@ -254,7 +254,7 @@ def get_string(prompt, options=None, title=None, empty_ok=False, force_prompt=Fa
             response = our_raw_input('> ', options, completer)
 
     # Translate the response into a Unicode string
-    if response is not None:
+    if response is not None and not isinstance(response, unicode):
         response = unicode(response, charset, 'replace')
 
     return response

-- 
Reportbug - reports bugs in the Debian distribution



More information about the Reportbug-commits mailing list