Updated exception syntax. This closes ecdavis#39.

pants/_channel.py

@@ -369,7 +369,7 @@ def _socket_connect(self, addr):
         """
         try:
             result = self._socket.connect_ex(addr)
-        except socket.error, err:
+        except socket.error as err:
             result = err[0]
 
         if not result or result == errno.EISCONN:
@@ -433,7 +433,7 @@ def _socket_accept(self):
         """
         try:
             return self._socket.accept()
-        except socket.error, err:
+        except socket.error as err:
             if err[0] in (errno.EAGAIN, errno.EWOULDBLOCK):
                 return None, None
             else:
@@ -448,7 +448,7 @@ def _socket_recv(self):
         """
         try:
             data = self._socket.recv(self._recv_amount)
-        except socket.error, err:
+        except socket.error as err:
             if err[0] in (errno.EAGAIN, errno.EWOULDBLOCK):
                 return ''
             elif err[0] == errno.ECONNRESET:
@@ -471,7 +471,7 @@ def _socket_recvfrom(self):
         """
         try:
             data, addr = self._socket.recvfrom(self._recv_amount)
-        except socket.error, err:
+        except socket.error as err:
             if err[0] in (errno.EAGAIN, errno.EWOULDBLOCK, errno.ECONNRESET):
                 return '', None
             else:
@@ -498,7 +498,7 @@ def _socket_send(self, data):
         # an exception if it needs a write event.
         try:
             return self._socket.send(data)
-        except Exception, err:
+        except Exception as err:
             if err[0] in (errno.EAGAIN, errno.EWOULDBLOCK):
                 self._start_waiting_for_write_event()
                 return 0
@@ -524,7 +524,7 @@ def _socket_sendto(self, data, addr, flags=0):
         """
         try:
             return self._socket.sendto(data, flags, addr)
-        except Exception, err:
+        except Exception as err:
             if err[0] in (errno.EAGAIN, errno.EWOULDBLOCK):
                 self._start_waiting_for_write_event()
                 return 0
@@ -553,7 +553,7 @@ def _socket_sendfile(self, sfile, offset, nbytes, fallback=False):
         """
         try:
             return sendfile(sfile, self, offset, nbytes, fallback)
-        except Exception, err:
+        except Exception as err:
             if err[0] in (errno.EAGAIN, errno.EWOULDBLOCK):
                 self._start_waiting_for_write_event()
                 return 0

pants/engine.py

@@ -211,7 +211,7 @@ def poll(self, poll_timeout):
 
         try:
             events = self._poller.poll(poll_timeout)
-        except Exception, err:
+        except Exception as err:
             if err[0] == errno.EINTR:
                 log.debug("Interrupted system call.")
                 return

pants/http/client.py

@@ -524,7 +524,7 @@ def _on_connect(self):
             cert = self._stream._socket.getpeercert()
             try:
                 match_hostname(cert, _hostname(request.url))
-            except CertificateError, err:
+            except CertificateError as err:
                 if not self._safely_call(request.session.on_ssl_error,
                         request.response, cert, err):
                     self._do_error(err)

pants/server.py

@@ -350,7 +350,7 @@ def _do_listen(self, addr, family, backlog, slave):
         try:
             self._socket_bind(addr)
             self._socket_listen(backlog)
-        except socket.error, err:
+        except socket.error as err:
             self.close()
             raise
 
@@ -388,7 +388,7 @@ def _handle_read_event(self):
                 try:
                     sock.setblocking(False)
                     sock = ssl.wrap_socket(sock, **self._ssl_options)
-                except ssl.SSLError, e:
+                except ssl.SSLError as e:
                     self._safely_call(self.on_ssl_wrap_error, sock, addr, e)
                     continue
 
@@ -433,7 +433,7 @@ def __init__(self, engine, server, addr, backlog):
         try:
             self._socket_bind(addr)
             self._socket_listen(backlog)
-        except socket.error, err:
+        except socket.error as err:
             self.close()
             raise
 

pants/stream.py

@@ -649,7 +649,7 @@ def _do_connect(self, address, family, error=None):
 
         try:
             connected = self._socket_connect(address)
-        except socket.error, err:
+        except socket.error as err:
             self.close(flush=False)
             e = StreamConnectError(err.errno, err.strerror)
             self._safely_call(self.on_connect_error, e)
@@ -671,7 +671,7 @@ def _handle_read_event(self):
         while True:
             try:
                 data = self._socket_recv()
-            except socket.error, err:
+            except socket.error as err:
                 self._safely_call(self.on_read_error, err)
                 return
 
@@ -853,7 +853,7 @@ def _process_send_string(self, data):
         """
         try:
             bytes_sent = self._socket_send(data)
-        except socket.error, err:
+        except socket.error as err:
             self._safely_call(self.on_write_error, err)
             return 0
 
@@ -868,7 +868,7 @@ def _process_send_file(self, sfile, offset, nbytes):
         """
         try:
             bytes_sent = self._socket_sendfile(sfile, offset, nbytes)
-        except socket.error, err:
+        except socket.error as err:
             self._safely_call(self.on_write_error, err)
             return 0
 
@@ -899,7 +899,7 @@ def _process_send_ssl_handshake(self, ssl_options):
         if not self._ssl_socket_wrapped:
             try:
                 self._socket = ssl.wrap_socket(self._socket, **ssl_options)
-            except ssl.SSLError, err:
+            except ssl.SSLError as err:
                 self._ssl_enabling = True
                 self._safely_call(self.on_ssl_error, err)
                 return 0
@@ -910,7 +910,7 @@ def _process_send_ssl_handshake(self, ssl_options):
 
         try:
             bytes_sent = self._ssl_do_handshake()
-        except Exception, err:
+        except Exception as err:
             self._safely_call(self.on_ssl_handshake_error, err)
             return 0
 
@@ -933,7 +933,7 @@ def _socket_recv(self):
         """
         try:
             return _Channel._socket_recv(self)
-        except ssl.SSLError, err:
+        except ssl.SSLError as err:
             if err[0] == ssl.SSL_ERROR_WANT_READ:
                 return ''
             else:
@@ -956,7 +956,7 @@ def _socket_send(self, data):
         """
         try:
             bytes_sent = _Channel._socket_send(self, data)
-        except ssl.SSLError, err:
+        except ssl.SSLError as err:
             if err[0] == ssl.SSL_ERROR_WANT_WRITE:
                 self._start_waiting_for_write_event()
                 return 0
@@ -994,7 +994,7 @@ def _ssl_do_handshake(self):
         """
         try:
             self._socket.do_handshake()
-        except ssl.SSLError, err:
+        except ssl.SSLError as err:
             if err[0] == ssl.SSL_ERROR_WANT_READ:
                 return 0
             elif err[0] == ssl.SSL_ERROR_WANT_WRITE:
@@ -1008,7 +1008,7 @@ def _ssl_do_handshake(self):
                 return 0
             else:
                 raise
-        except socket.error, err:
+        except socket.error as err:
             if err[0] in (errno.ECONNRESET, errno.EPIPE):
                 self.close(flush=False)
                 return 0

pants/test/test_engine.py

@@ -232,7 +232,7 @@ def test_poller_raises_EINTR(self):
         self.engine._poller.poll = MagicMock(side_effect=Exception(errno.EINTR))
         try:
             self.engine.poll(0.02)
-        except Exception, err:
+        except Exception as err:
             if err[0] == errno.EINTR:
                 self.fail("EINTR during polling was not caught.")