except Exception as e syntax in green.core

We now depend on py2.6, so the new-style syntax is acceptable
zeromq · May 18, 2012 · 7ab9b10 · 7ab9b10
1 parent a61edcd
commit 7ab9b10
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/zmq/green/core.py b/zmq/green/core.py
@@ -57,7 +57,7 @@ def close(self, linger=None):
         if not self._closed and getattr(self, '_state_event', None):
             try:
                 self._state_event.stop()
-            except AttributeError, e:
+            except AttributeError as e:
                 # gevent<1.0 compat
                 self._state_event.cancel()
         super(_Socket, self).close(linger)
@@ -81,7 +81,7 @@ def __state_changed(self, event=None, _evtype=None):
                 self.__readable.set()
                 return
             events = self.getsockopt(zmq.EVENTS)
-        except ZMQError, exc:
+        except ZMQError as exc:
             self.__writable.set_exception(exc)
             self.__readable.set_exception(exc)
         else:
@@ -108,7 +108,7 @@ def send(self, data, flags=0, copy=True, track=False):
             try:
                 # attempt the actual call
                 return super(_Socket, self).send(data, flags, copy, track)
-            except zmq.ZMQError, e:
+            except zmq.ZMQError as e:
                 # if the raised ZMQError is not EAGAIN, reraise
                 if e.errno != zmq.EAGAIN:
                     raise
@@ -122,7 +122,7 @@ def recv(self, flags=0, copy=True, track=False):
         while True:
             try:
                 return super(_Socket, self).recv(flags, copy, track)
-            except zmq.ZMQError, e:
+            except zmq.ZMQError as e:
                 if e.errno != zmq.EAGAIN:
                     raise
             self._wait_read()