Remove more calls to str

sebastinas · sebastinas · commit 7eaef534e05d · 2015-03-08T22:19:52.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/config.py b/bpython/config.py
@@ -55,7 +55,7 @@ def fill_config_with_default_values(config, default_values):
 
         for (opt, val) in iteritems(default_values[section]):
             if not config.has_option(section, opt):
-                config.set(section, opt, str(val))
+                config.set(section, opt, '%s' % (val, ))
 
 
 def loadini(struct, configfile):
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -717,8 +717,7 @@ def write2file(self):
             with open(fn, mode) as f:
                 f.write(s)
         except IOError as e:
-            self.interact.notify(_("Error writing file '%s': %s") % (fn,
-                                                                     str(e)))
+            self.interact.notify(_("Error writing file '%s': %s") % (fn, e))
         else:
             self.interact.notify(_('Saved to %s.') % (fn, ))
 
@@ -778,7 +777,7 @@ def do_pastebin_json(self, s):
             response = requests.post(url, data=payload, verify=True)
             response.raise_for_status()
         except requests.exceptions.RequestException as exc:
-            self.interact.notify(_('Upload failed: %s') % (str(exc), ))
+            self.interact.notify(_('Upload failed: %s') % (exc, ))
             return
 
         self.prev_pastebin_content = s
@@ -866,7 +865,7 @@ def insert_into_history(self, s):
             self.rl_history.append_reload_and_write(s, self.config.hist_file,
                                                     getpreferredencoding())
         except RuntimeError as e:
-            self.interact.notify(str(e))
+            self.interact.notify(u"%s" % (e, ))
 
     def prompt_undo(self):
         """Returns how many lines to undo, 0 means don't undo"""
@@ -1081,7 +1080,7 @@ def edit_config(self):
                         f.write(default_config)
                 except (IOError, OSError) as e:
                     self.interact.notify(_("Error writing file '%s': %s") %
-                                         (self.config.config.path, str(e)))
+                                         (self.config.config.path, e))
                     return False
             else:
                 return False
