Replace str(e) with "%s" % e where possible (fixes #501)

sebastinas · sebastinas · commit 30f943f09d50 · 2015-03-08T22:08:10.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -562,7 +562,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') % (e, ))
 
         elif isinstance(e, bpythonevents.UndoEvent):
             self.undo(n=e.n)
@@ -1532,7 +1532,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('%s' % (e, ))
         else:
             if self.config.highlight_show_source:
                 source = format(PythonLexer().get_tokens(source),
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -545,11 +545,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 = _(u"Cannot get source: %s") % (e, )
         except IOError as e:
-            msg = str(e)
+            msg = u"%s" % (e, )
         except TypeError as e:
-            if "built-in" in str(e):
+            if "built-in" in u"%s" % (e, ):
                 msg = _("Cannot access source of %r") % (obj, )
             else:
                 msg = _("No source code found for %s") % (self.current_line, )
