From 28079171a037e9bdd7a190fe8bd1446e02c8071f Mon Sep 17 00:00:00 2001
From: "Eevee (Alex Munroe)" <eevee.git@veekun.com>
Date: Sun, 11 May 2014 17:04:45 -0700
Subject: Fix `except ... as`.

This would normally be done with 2to3.  But I'm trying to run the test
suite against 3, and urwid requires 2.6 anyway.
---
 urwid/main_loop.py   | 2 +-
 urwid/raw_display.py | 6 +++---
 urwid/util.py        | 2 +-
 urwid/vterm.py       | 4 ++--
 urwid/web_display.py | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/urwid/main_loop.py b/urwid/main_loop.py
index 5d3be1f..2c314d8 100755
--- a/urwid/main_loop.py
+++ b/urwid/main_loop.py
@@ -640,7 +640,7 @@ class SelectEventLoop(object):
             while True:
                 try:
                     self._loop()
-                except select.error, e:
+                except select.error as e:
                     if e.args[0] != 4:
                         # not just something we need to retry
                         raise
diff --git a/urwid/raw_display.py b/urwid/raw_display.py
index 610709e..cdccdef 100644
--- a/urwid/raw_display.py
+++ b/urwid/raw_display.py
@@ -494,7 +494,7 @@ class Screen(BaseScreen, RealTerminal):
         try:
             while self.gpm_mev is not None and self.gpm_event_pending:
                 codes.extend(self._encode_gpm_event())
-        except IOError, e:
+        except IOError as e:
             if e.args[0] != 11:
                 raise
         return codes
@@ -513,7 +513,7 @@ class Screen(BaseScreen, RealTerminal):
                     ready,w,err = select.select(
                         fd_list,[],fd_list, timeout)
                 break
-            except select.error, e:
+            except select.error as e:
                 if e.args[0] != 4:
                     raise
                 if self._resized:
@@ -822,7 +822,7 @@ class Screen(BaseScreen, RealTerminal):
                     l = l.decode('utf-8')
                 self._term_output_file.write(l)
             self._term_output_file.flush()
-        except IOError, e:
+        except IOError as e:
             # ignore interrupted syscall
             if e.args[0] != 4:
                 raise
diff --git a/urwid/util.py b/urwid/util.py
index ced247e..4e71f97 100644
--- a/urwid/util.py
+++ b/urwid/util.py
@@ -45,7 +45,7 @@ def detect_encoding():
         except locale.Error:
             pass
         return locale.getlocale()[1] or ""
-    except ValueError, e:
+    except ValueError as e:
         # with invalid LANG value python will throw ValueError
         if e.args and e.args[0].startswith("unknown locale"):
             return ""
diff --git a/urwid/vterm.py b/urwid/vterm.py
index 212094c..cc4eb7f 100644
--- a/urwid/vterm.py
+++ b/urwid/vterm.py
@@ -1522,7 +1522,7 @@ class Terminal(Widget):
             try:
                 select.select([self.master], [], [], timeout)
                 break
-            except select.error, e:
+            except select.error as e:
                 if e.args[0] != 4:
                     raise
         self.feed()
@@ -1532,7 +1532,7 @@ class Terminal(Widget):
 
         try:
             data = os.read(self.master, 4096)
-        except OSError, e:
+        except OSError as e:
             if e.errno == 5: # End Of File
                 data = ''
             elif e.errno == errno.EWOULDBLOCK: # empty buffer
diff --git a/urwid/web_display.py b/urwid/web_display.py
index e18555e..e088476 100755
--- a/urwid/web_display.py
+++ b/urwid/web_display.py
@@ -880,7 +880,7 @@ class Screen:
         try:
             iready,oready,eready = select.select(
                 [self.input_fd],[],[],0.5)
-        except select.error, e:
+        except select.error as e:
             # return on interruptions
             if e.args[0] == 4:
                 if raw_keys:
-- 
cgit v1.2.1