pretty-print exceptions in unicide

thomasballinger · thomasballinger · commit 6ffd412fddf3 · 2015-03-06T22:09:19.000-05:00
fixes crashes on display of str(exception):
* view source errors
* startup file io error
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -86,6 +86,7 @@
 EXAMPLE_CONFIG_URL = 'https://raw.githubusercontent.com/bpython/bpython/master/bpython/sample-config'
 
 # This is needed for is_nop and should be removed once is_nop is fixed.
+# Also needed for pretty-printing exceptions for error messages
 if py3:
     unicode = str
 
@@ -570,7 +571,7 @@ def process_control_event(self, e):
                 self.startup()
             except IOError as e:
                 self.status_bar.message(
-                    _('Executing PYTHONSTARTUP failed: %s') % (str(e)))
+                    _('Executing PYTHONSTARTUP failed: %s') % (unicode(e)))
 
         elif isinstance(e, bpythonevents.UndoEvent):
             self.undo(n=e.n)
@@ -1540,7 +1541,7 @@ def show_source(self):
         try:
             source = self.get_source_of_current_name()
         except SourceNotFound as e:
-            self.status_bar.message(str(e))
+            self.status_bar.message(unicode(e))
         else:
             if self.config.highlight_show_source:
                 source = format(PythonLexer().get_tokens(source),
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -55,6 +55,9 @@
 from bpython.history import History
 from bpython.translations import _, ngettext
 
+if py3:  # used for getting pretty-printing exceptions
+    unicode = str
+
 
 class RuntimeTimer(object):
     def __init__(self):
@@ -545,11 +548,11 @@ def get_source_of_current_name(self):
                     obj = self.get_object(line)
             return inspection.get_source_unicode(obj)
         except (AttributeError, NameError) as e:
-            msg = _("Cannot get source: %s") % (str(e), )
+            msg = _("Cannot get source: %s") % (unicode(e), )
         except IOError as e:
-            msg = str(e)
+            msg = unicode(e)
         except TypeError as e:
-            if "built-in" in str(e):
+            if "built-in" in unicode(e):
                 msg = _("Cannot access source of %r") % (obj, )
             else:
                 msg = _("No source code found for %s") % (self.current_line, )
