Use except Foo as e consistently

sebastinas · sebastinas · commit 65a17cf8420c · 2015-01-09T08:12:18.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1077,7 +1077,7 @@ def push(self, s, insert_into_history=True):
         curses.raw(False)
         try:
             return repl.Repl.push(self, s, insert_into_history)
-        except SystemExit, e:
+        except SystemExit as e:
             # Avoid a traceback on e.g. quit()
             self.do_exit = True
             self.exit_value = e.args
@@ -1895,7 +1895,7 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
         exit_value = ()
         try:
             bpython.args.exec_code(interpreter, args)
-        except SystemExit, e:
+        except SystemExit as e:
             # The documentation of code.InteractiveInterpreter.runcode claims
             # that it reraises SystemExit. However, I can't manage to trigger
             # that. To be one the safe side let's catch SystemExit here anyway.
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -58,7 +58,7 @@ def main(args=None, locals_=None, banner=None):
             try:
                 interp = code.InteractiveInterpreter(locals=locals_)
                 bpargs.exec_code(interp, exec_args)
-            except SystemExit, e:
+            except SystemExit as e:
                 exit_value = e.args
             if not options.interactive:
                 raise SystemExit(exit_value)
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1351,7 +1351,7 @@ def pager(self, text):
     def show_source(self):
         try:
             source = self.get_source_of_current_name()
-        except SourceNotFound, e:
+        except SourceNotFound as e:
             self.status_bar.message(_(e))
         else:
             if self.config.highlight_show_source:
diff --git a/bpython/pager.py b/bpython/pager.py
@@ -54,20 +54,22 @@ def page(data, use_internal=False):
                 data = data.encode(sys.__stdout__.encoding, 'replace')
             popen.stdin.write(data)
             popen.stdin.close()
-        except OSError, e:
+        except OSError as e:
             if e.errno == errno.ENOENT:
                 # pager command not found, fall back to internal pager
                 page_internal(data)
                 return
-        except IOError, e:
+        except IOError as e:
             if e.errno != errno.EPIPE:
                 raise
         while True:
             try:
                 popen.wait()
-            except OSError, e:
+            except OSError as e:
                 if e.errno != errno.EINTR:
                     raise
             else:
                 break
         curses.doupdate()
+
+# vim: sw=4 ts=4 sts=4 ai et
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -602,11 +602,11 @@ def get_source_of_current_name(self):
                 if inspection.is_eval_safe_name(line):
                     obj = self.get_object(line)
             return inspect.getsource(obj)
-        except (AttributeError, NameError), e:
+        except (AttributeError, NameError) as e:
             msg = "Cannot get source: " + str(e)
-        except IOError, e:
+        except IOError as e:
             msg = str(e)
-        except TypeError, e:
+        except TypeError as e:
             if "built-in" in str(e):
                 msg = "Cannot access source of %r" % (obj, )
             else:
@@ -840,7 +840,7 @@ def do_pastebin_helper(self, s):
             helper.stdin.write(s.encode(getpreferredencoding()))
             output = helper.communicate()[0].decode(getpreferredencoding())
             paste_url = output.split()[0]
-        except OSError, e:
+        except OSError as e:
             if e.errno == errno.ENOENT:
                 self.interact.notify(_('Upload failed: '
                                        'Helper program not found.'))
@@ -898,7 +898,7 @@ def insert_into_history(self, s):
             self.rl_history.append(s)
             try:
                 self.rl_history.save(histfilename, getpreferredencoding(), self.config.hist_length)
-            except EnvironmentError, err:
+            except EnvironmentError as err:
                 self.interact.notify("Error occured while writing to file %s (%s) " % (histfilename, err.strerror))
                 self.rl_history.entries = oldhistory
                 self.rl_history.append(s)
