applied the except and raise fixers to the master branch to close the gap with py3

[nepi.git] / src / nepi / resources / netns / netnsserver.py

diff --git a/src/nepi/resources/netns/netnsserver.py b/src/nepi/resources/netns/netnsserver.py
index a7ddb4d..224a603 100644 (file)
--- a/src/nepi/resources/netns/netnsserver.py
+++ b/src/nepi/resources/netns/netnsserver.py
@@ -89,7 +89,7 @@ def recv_msg(conn):
     while '\n' not in chunk:
         try:
             chunk = conn.recv(1024)
-        except (OSError, socket.error), e:
+        except (OSError, socket.error) as e:
             if e[0] != errno.EINTR:
                 raise
             # Ignore eintr errors
@@ -175,7 +175,7 @@ def run_server(socket_name, level = logging.INFO,
 
         try:
             (msg_type, args, kwargs) = recv_msg(conn)
-        except socket.timeout, e:
+        except socket.timeout as e:
             # Ingore time-out
             continue