From 80633ab22486228a64184bb9d8d6fd0ea7977677 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sun, 22 Sep 2013 22:56:44 -0400 Subject: [PATCH] python3 compat: 2to3: `except E as e:` syntax First step to Python 3 compatibility "2to3 -w -f except ." See [1] [1] http://docs.python.org/2/library/2to3.html#fixers --- eventlet/__init__.py | 2 +- eventlet/api.py | 2 +- eventlet/backdoor.py | 2 +- eventlet/green/OpenSSL/SSL.py | 2 +- eventlet/green/_socket_nodns.py | 6 +++--- eventlet/green/os.py | 10 +++++----- eventlet/green/socket.py | 4 ++-- eventlet/green/ssl.py | 12 ++++++------ eventlet/green/subprocess.py | 2 +- eventlet/green/zmq.py | 4 ++-- eventlet/greenio.py | 28 ++++++++++++++-------------- eventlet/hubs/epolls.py | 2 +- eventlet/hubs/hub.py | 4 ++-- eventlet/hubs/kqueue.py | 6 +++--- eventlet/hubs/poll.py | 2 +- eventlet/hubs/selects.py | 4 ++-- eventlet/proc.py | 2 +- eventlet/processes.py | 4 ++-- eventlet/support/greendns.py | 16 ++++++++-------- eventlet/support/greenlets.py | 4 ++-- eventlet/timeout.py | 2 +- eventlet/websocket.py | 2 +- eventlet/wsgi.py | 10 +++++----- examples/chat_server.py | 2 +- examples/twisted/twisted_client.py | 2 +- examples/twisted/twisted_server.py | 2 +- examples/zmq_chat.py | 2 +- tests/greenio_test.py | 24 ++++++++++++------------ tests/greenpool_test.py | 2 +- tests/queue_test.py | 2 +- tests/stdlib/all_modules.py | 2 +- tests/test__event.py | 2 +- tests/test__greenness.py | 2 +- tests/test__proc.py | 2 +- tests/test__socket_errors.py | 4 ++-- tests/timeout_test.py | 4 ++-- tests/timeout_test_with_statement.py | 10 +++++----- tests/websocket_test.py | 2 +- tests/wsgi_test.py | 10 +++++----- tests/zmq_test.py | 2 +- 40 files changed, 104 insertions(+), 104 deletions(-) diff --git a/eventlet/__init__.py b/eventlet/__init__.py index e78f8a9..9f3ebb2 100644 --- a/eventlet/__init__.py +++ b/eventlet/__init__.py @@ -39,7 +39,7 @@ try: TimeoutError = timeout.Timeout exc_after = greenthread.exc_after call_after_global = greenthread.call_after_global -except ImportError, e: +except ImportError as e: # This is to make Debian packaging easier, it ignores import # errors of greenlet so that the packager can still at least # access the version. Also this makes easy_install a little quieter diff --git a/eventlet/api.py b/eventlet/api.py index 5b78e83..d0dea4c 100644 --- a/eventlet/api.py +++ b/eventlet/api.py @@ -191,7 +191,7 @@ def named(name): try: obj = __import__(toimport) break - except ImportError, err: + except ImportError as err: # print 'Import error on %s: %s' % (toimport, err) # debugging spam import_err_strings.append(err.__str__()) toimport = '.'.join(toimport.split('.')[:-1]) diff --git a/eventlet/backdoor.py b/eventlet/backdoor.py index 78d0b74..db40b7a 100644 --- a/eventlet/backdoor.py +++ b/eventlet/backdoor.py @@ -85,7 +85,7 @@ def backdoor_server(sock, locals=None): while True: socketpair = sock.accept() backdoor(socketpair, locals) - except socket.error, e: + except socket.error as e: # Broken pipe means it was shutdown if get_errno(e) != errno.EPIPE: raise diff --git a/eventlet/green/OpenSSL/SSL.py b/eventlet/green/OpenSSL/SSL.py index 2884024..5042217 100644 --- a/eventlet/green/OpenSSL/SSL.py +++ b/eventlet/green/OpenSSL/SSL.py @@ -61,7 +61,7 @@ class GreenConnection(greenio.GreenSocket): write=True, timeout=self.gettimeout(), timeout_exc=socket.timeout) - except SysCallError, e: + except SysCallError as e: if get_errno(e) == -1 or get_errno(e) > 0: return '' diff --git a/eventlet/green/_socket_nodns.py b/eventlet/green/_socket_nodns.py index bdaf0f3..9a526ff 100644 --- a/eventlet/green/_socket_nodns.py +++ b/eventlet/green/_socket_nodns.py @@ -52,7 +52,7 @@ class GreenSSLObject(object): else: try: self.connection.do_handshake() - except _SSL.SysCallError, e: + except _SSL.SysCallError as e: raise _convert_to_sslerror(e) def read(self, n=1024): @@ -62,7 +62,7 @@ class GreenSSLObject(object): return self.connection.read(n) except _SSL.ZeroReturnError: return '' - except _SSL.SysCallError, e: + except _SSL.SysCallError as e: raise _convert_to_sslerror(e) def write(self, s): @@ -70,7 +70,7 @@ class GreenSSLObject(object): The return value is the number of bytes written. """ try: return self.connection.write(s) - except _SSL.SysCallError, e: + except _SSL.SysCallError as e: raise _convert_to_sslerror(e) def server(self): diff --git a/eventlet/green/os.py b/eventlet/green/os.py index 7ecd1ba..e16041a 100644 --- a/eventlet/green/os.py +++ b/eventlet/green/os.py @@ -22,7 +22,7 @@ def fdopen(fd, *args, **kw): raise TypeError('fd should be int, not %r' % fd) try: return greenio.GreenPipe(fd, *args, **kw) - except IOError, e: + except IOError as e: raise OSError(*e.args) __original_read__ = os_orig.read @@ -33,10 +33,10 @@ def read(fd, n): while True: try: return __original_read__(fd, n) - except (OSError, IOError), e: + except (OSError, IOError) as e: if get_errno(e) != errno.EAGAIN: raise - except socket.error, e: + except socket.error as e: if get_errno(e) == errno.EPIPE: return '' raise @@ -51,10 +51,10 @@ def write(fd, st): while True: try: return __original_write__(fd, st) - except (OSError, IOError), e: + except (OSError, IOError) as e: if get_errno(e) != errno.EAGAIN: raise - except socket.error, e: + except socket.error as e: if get_errno(e) != errno.EPIPE: raise hubs.trampoline(fd, write=True) diff --git a/eventlet/green/socket.py b/eventlet/green/socket.py index 5b3991f..81dd476 100644 --- a/eventlet/green/socket.py +++ b/eventlet/green/socket.py @@ -15,7 +15,7 @@ greendns = None if os.environ.get("EVENTLET_NO_GREENDNS",'').lower() != "yes": try: from eventlet.support import greendns - except ImportError, ex: + except ImportError as ex: pass if greendns: @@ -52,7 +52,7 @@ def create_connection(address, sock.connect(sa) return sock - except error, msg: + except error as msg: if sock is not None: sock.close() diff --git a/eventlet/green/ssl.py b/eventlet/green/ssl.py index c8abce7..40d29b0 100644 --- a/eventlet/green/ssl.py +++ b/eventlet/green/ssl.py @@ -75,7 +75,7 @@ class GreenSSLSocket(__ssl.SSLSocket): while True: try: return func(*a, **kw) - except SSLError, exc: + except SSLError as exc: if get_errno(exc) == SSL_ERROR_WANT_READ: trampoline(self, read=True, @@ -137,7 +137,7 @@ class GreenSSLSocket(__ssl.SSLSocket): while True: try: return socket.sendall(self, data, flags) - except orig_socket.error, e: + except orig_socket.error as e: if self.act_non_blocking: raise if get_errno(e) == errno.EWOULDBLOCK: @@ -160,7 +160,7 @@ class GreenSSLSocket(__ssl.SSLSocket): while True: try: return socket.recv(self, buflen, flags) - except orig_socket.error, e: + except orig_socket.error as e: if self.act_non_blocking: raise if get_errno(e) == errno.EWOULDBLOCK: @@ -206,7 +206,7 @@ class GreenSSLSocket(__ssl.SSLSocket): while True: try: return real_connect(self, addr) - except orig_socket.error, exc: + except orig_socket.error as exc: if get_errno(exc) in CONNECT_ERR: trampoline(self, write=True) elif get_errno(exc) in CONNECT_SUCCESS: @@ -218,7 +218,7 @@ class GreenSSLSocket(__ssl.SSLSocket): while True: try: real_connect(self, addr) - except orig_socket.error, exc: + except orig_socket.error as exc: if get_errno(exc) in CONNECT_ERR: trampoline(self, write=True, timeout=end-time.time(), timeout_exc=timeout_exc('timed out')) @@ -262,7 +262,7 @@ class GreenSSLSocket(__ssl.SSLSocket): newsock, addr = socket.accept(self) set_nonblocking(newsock) break - except orig_socket.error, e: + except orig_socket.error as e: if get_errno(e) != errno.EWOULDBLOCK: raise trampoline(self, read=True, timeout=self.gettimeout(), diff --git a/eventlet/green/subprocess.py b/eventlet/green/subprocess.py index 3bb41c9..a7196e9 100644 --- a/eventlet/green/subprocess.py +++ b/eventlet/green/subprocess.py @@ -64,7 +64,7 @@ class Popen(subprocess_orig.Popen): if timeout is not None and time.time() > endtime: raise TimeoutExpired(self.args) eventlet.sleep(check_interval) - except OSError, e: + except OSError as e: if e.errno == errno.ECHILD: # no child process, this happens if the child process # already died and has been cleaned up diff --git a/eventlet/green/zmq.py b/eventlet/green/zmq.py index 09caf28..ea4d19c 100644 --- a/eventlet/green/zmq.py +++ b/eventlet/green/zmq.py @@ -273,7 +273,7 @@ class Socket(_Socket): while True: try: return _Socket_send(self, msg, flags, copy, track) - except ZMQError, e: + except ZMQError as e: if e.errno == EAGAIN: self._eventlet_send_event.block() else: @@ -319,7 +319,7 @@ class Socket(_Socket): while True: try: return _Socket_recv(self, flags, copy, track) - except ZMQError, e: + except ZMQError as e: if e.errno == EAGAIN: self._eventlet_recv_event.block() else: diff --git a/eventlet/greenio.py b/eventlet/greenio.py index 9783f02..d521deb 100644 --- a/eventlet/greenio.py +++ b/eventlet/greenio.py @@ -54,7 +54,7 @@ def socket_accept(descriptor): """ try: return descriptor.accept() - except socket.error, e: + except socket.error as e: if get_errno(e) == errno.EWOULDBLOCK: return None raise @@ -210,7 +210,7 @@ class GreenSocket(object): try: trampoline(fd, write=True) socket_checkerr(fd) - except socket.error, ex: + except socket.error as ex: return get_errno(ex) else: end = time.time() + self.gettimeout() @@ -223,7 +223,7 @@ class GreenSocket(object): trampoline(fd, write=True, timeout=end - time.time(), timeout_exc=socket.timeout(errno.EAGAIN)) socket_checkerr(fd) - except socket.error, ex: + except socket.error as ex: return get_errno(ex) def dup(self, *args, **kw): @@ -251,7 +251,7 @@ class GreenSocket(object): while True: try: return fd.recv(buflen, flags) - except socket.error, e: + except socket.error as e: if get_errno(e) in SOCKET_BLOCKING: pass elif get_errno(e) in SOCKET_CLOSED: @@ -293,7 +293,7 @@ class GreenSocket(object): while 1: try: total_sent += fd.send(data[total_sent:], flags) - except socket.error, e: + except socket.error as e: if get_errno(e) not in SOCKET_BLOCKING: raise @@ -369,7 +369,7 @@ class _SocketDuckForFd(object): try: data = os.read(self._fileno, buflen) return data - except OSError, e: + except OSError as e: if get_errno(e) != errno.EAGAIN: raise IOError(*e.args) trampoline(self, read=True) @@ -380,7 +380,7 @@ class _SocketDuckForFd(object): fileno = self._fileno try: total_sent = os_write(fileno, data) - except OSError, e: + except OSError as e: if get_errno(e) != errno.EAGAIN: raise IOError(*e.args) total_sent = 0 @@ -388,7 +388,7 @@ class _SocketDuckForFd(object): trampoline(self, write=True) try: total_sent += os_write(fileno, data[total_sent:]) - except OSError, e: + except OSError as e: if get_errno(e) != errno. EAGAIN: raise IOError(*e.args) @@ -479,7 +479,7 @@ class GreenPipe(_fileobject): n = len(data) try: buf[:n] = data - except TypeError, err: + except TypeError as err: if not isinstance(buf, array.array): raise err buf[:n] = array.array('c', data) @@ -500,7 +500,7 @@ class GreenPipe(_fileobject): self.flush() try: return os.lseek(self.fileno(), 0, 1) - self._get_readahead_len() - except OSError, e: + except OSError as e: raise IOError(*e.args) def seek(self, offset, whence=0): @@ -511,7 +511,7 @@ class GreenPipe(_fileobject): offset -= self._get_readahead_len() try: rv = os.lseek(self.fileno(), offset, whence) - except OSError, e: + except OSError as e: raise IOError(*e.args) else: self._clear_readahead_buf() @@ -524,7 +524,7 @@ class GreenPipe(_fileobject): size = self.tell() try: rv = os.ftruncate(self.fileno(), size) - except OSError, e: + except OSError as e: raise IOError(*e.args) else: self.seek(size) # move position&clear buffer @@ -533,7 +533,7 @@ class GreenPipe(_fileobject): def isatty(self): try: return os.isatty(self.fileno()) - except OSError, e: + except OSError as e: raise IOError(*e.args) @@ -572,7 +572,7 @@ def shutdown_safe(sock): except TypeError: # SSL.Connection return sock.shutdown() - except socket.error, e: + except socket.error as e: # we don't care if the socket is already closed; # this will often be the case in an http server context if get_errno(e) != errno.ENOTCONN: diff --git a/eventlet/hubs/epolls.py b/eventlet/hubs/epolls.py index 17bdfe8..a45d460 100644 --- a/eventlet/hubs/epolls.py +++ b/eventlet/hubs/epolls.py @@ -52,7 +52,7 @@ class Hub(poll.Hub): self.register(fileno, new=True) else: self.register(fileno, new=False) - except IOError, ex: # ignore EEXIST, #80 + except IOError as ex: # ignore EEXIST, #80 if get_errno(ex) != errno.EEXIST: raise return listener diff --git a/eventlet/hubs/hub.py b/eventlet/hubs/hub.py index 33f7985..e25c752 100644 --- a/eventlet/hubs/hub.py +++ b/eventlet/hubs/hub.py @@ -154,7 +154,7 @@ class BaseHub(object): for listener in listeners: try: listener.cb(fileno) - except Exception, e: + except Exception as e: self.squelch_generic_exception(sys.exc_info()) def ensure_greenlet(self): @@ -192,7 +192,7 @@ class BaseHub(object): sys.stderr.flush() try: self.remove_descriptor(fileno) - except Exception, e: + except Exception as e: sys.stderr.write("Exception while removing descriptor! %r\n" % (e,)) sys.stderr.flush() diff --git a/eventlet/hubs/kqueue.py b/eventlet/hubs/kqueue.py index 9fbc9e2..00a1a57 100644 --- a/eventlet/hubs/kqueue.py +++ b/eventlet/hubs/kqueue.py @@ -74,7 +74,7 @@ class Hub(BaseHub): event = self._events[fileno].pop(evtype) try: self._delete_events([event]) - except OSError, e: + except OSError as e: pass def remove_descriptor(self, fileno): @@ -82,9 +82,9 @@ class Hub(BaseHub): try: events = self._events.pop(fileno).values() self._delete_events(events) - except KeyError, e: + except KeyError as e: pass - except OSError, e: + except OSError as e: pass def wait(self, seconds=None): diff --git a/eventlet/hubs/poll.py b/eventlet/hubs/poll.py index 096f1d0..6284e72 100644 --- a/eventlet/hubs/poll.py +++ b/eventlet/hubs/poll.py @@ -82,7 +82,7 @@ class Hub(BaseHub): return try: presult = self.do_poll(seconds) - except (IOError, select.error), e: + except (IOError, select.error) as e: if get_errno(e) == errno.EINTR: return raise diff --git a/eventlet/hubs/selects.py b/eventlet/hubs/selects.py index b7d5540..f4b63fd 100644 --- a/eventlet/hubs/selects.py +++ b/eventlet/hubs/selects.py @@ -20,7 +20,7 @@ class Hub(BaseHub): for fd in self.listeners[READ].keys() + self.listeners[WRITE].keys(): try: select.select([fd], [], [], 0) - except select.error, e: + except select.error as e: if get_errno(e) in BAD_SOCK: self.remove_descriptor(fd) @@ -33,7 +33,7 @@ class Hub(BaseHub): return try: r, w, er = select.select(readers.keys(), writers.keys(), readers.keys() + writers.keys(), seconds) - except select.error, e: + except select.error as e: if get_errno(e) == errno.EINTR: return elif get_errno(e) in BAD_SOCK: diff --git a/eventlet/proc.py b/eventlet/proc.py index 0ecc3f5..950744c 100644 --- a/eventlet/proc.py +++ b/eventlet/proc.py @@ -651,7 +651,7 @@ class wrap_errors(object): def __call__(self, *args, **kwargs): try: return self.func(*args, **kwargs) - except self.errors, ex: + except self.errors as ex: return ex def __str__(self): diff --git a/eventlet/processes.py b/eventlet/processes.py index 71c8c80..e16fde7 100644 --- a/eventlet/processes.py +++ b/eventlet/processes.py @@ -35,7 +35,7 @@ def cooperative_wait(pobj, check_interval=0.01): if status >= 0: return status api.sleep(check_interval) - except OSError, e: + except OSError as e: if e.errno == errno.ECHILD: # no child process, this happens if the child process # already died and has been cleaned up, or if you just @@ -109,7 +109,7 @@ class Process(object): try: written = self.child_stdin.write(stuff) self.child_stdin.flush() - except ValueError, e: + except ValueError as e: ## File was closed assert str(e) == 'I/O operation on closed file' if written == 0: diff --git a/eventlet/support/greendns.py b/eventlet/support/greendns.py index 2c915c6..804b552 100644 --- a/eventlet/support/greendns.py +++ b/eventlet/support/greendns.py @@ -120,9 +120,9 @@ def resolve(name): if rrset is None or time.time() > rrset.expiration: try: rrset = resolver.query(name) - except dns.exception.Timeout, e: + except dns.exception.Timeout as e: error = (socket.EAI_AGAIN, 'Lookup timed out') - except dns.exception.DNSException, e: + except dns.exception.DNSException as e: error = (socket.EAI_NODATA, 'No address associated with hostname') else: pass @@ -147,9 +147,9 @@ def getaliases(host): try: answers = dns.resolver.query(host, 'cname') - except dns.exception.Timeout, e: + except dns.exception.Timeout as e: error = (socket.EAI_AGAIN, 'Lookup timed out') - except dns.exception.DNSException, e: + except dns.exception.DNSException as e: error = (socket.EAI_NODATA, 'No address associated with hostname') else: for record in answers: @@ -232,10 +232,10 @@ def getnameinfo(sockaddr, flags): if len(rrset) > 1: raise socket.error('sockaddr resolved to multiple addresses') host = rrset[0].target.to_text(omit_final_dot=True) - except dns.exception.Timeout, e: + except dns.exception.Timeout as e: if flags & socket.NI_NAMEREQD: raise socket.gaierror((socket.EAI_AGAIN, 'Lookup timed out')) - except dns.exception.DNSException, e: + except dns.exception.DNSException as e: if flags & socket.NI_NAMEREQD: raise socket.gaierror( (socket.EAI_NONAME, 'Name or service not known')) @@ -246,9 +246,9 @@ def getnameinfo(sockaddr, flags): raise socket.error('sockaddr resolved to multiple addresses') if flags & socket.NI_NUMERICHOST: host = rrset[0].address - except dns.exception.Timeout, e: + except dns.exception.Timeout as e: raise socket.gaierror((socket.EAI_AGAIN, 'Lookup timed out')) - except dns.exception.DNSException, e: + except dns.exception.DNSException as e: raise socket.gaierror( (socket.EAI_NODATA, 'No address associated with hostname')) diff --git a/eventlet/support/greenlets.py b/eventlet/support/greenlets.py index e33f37f..c778f04 100644 --- a/eventlet/support/greenlets.py +++ b/eventlet/support/greenlets.py @@ -7,7 +7,7 @@ try: preserves_excinfo = (distutils.version.LooseVersion(greenlet.__version__) >= distutils.version.LooseVersion('0.3.2')) greenlet = greenlet.greenlet -except ImportError, e: +except ImportError as e: raise try: from py.magic import greenlet @@ -25,5 +25,5 @@ except ImportError, e: from support.stacklesss import greenlet, getcurrent, GreenletExit preserves_excinfo = False (greenlet, getcurrent, GreenletExit) # silence pyflakes - except ImportError, e: + except ImportError as e: raise ImportError("Unable to find an implementation of greenlet.") diff --git a/eventlet/timeout.py b/eventlet/timeout.py index 573f4ab..ba44763 100644 --- a/eventlet/timeout.py +++ b/eventlet/timeout.py @@ -140,7 +140,7 @@ def with_timeout(seconds, function, *args, **kwds): try: try: return function(*args, **kwds) - except Timeout, ex: + except Timeout as ex: if ex is timeout and timeout_value is not _NONE: return timeout_value raise diff --git a/eventlet/websocket.py b/eventlet/websocket.py index 7f3e048..4ba20c4 100644 --- a/eventlet/websocket.py +++ b/eventlet/websocket.py @@ -109,7 +109,7 @@ class WebSocketWSGI(object): sock.sendall(handshake_reply) try: self.handler(ws) - except socket.error, e: + except socket.error as e: if get_errno(e) not in ACCEPTABLE_CLIENT_ERRORS: raise # Make sure we send the closing frame diff --git a/eventlet/wsgi.py b/eventlet/wsgi.py index 4eefb00..b4208b0 100644 --- a/eventlet/wsgi.py +++ b/eventlet/wsgi.py @@ -237,7 +237,7 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler): return except greenio.SSL.ZeroReturnError: self.raw_requestline = '' - except socket.error, e: + except socket.error as e: if get_errno(e) not in BAD_SOCK: raise self.raw_requestline = '' @@ -283,7 +283,7 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler): self.server.outstanding_requests += 1 try: self.handle_one_response() - except socket.error, e: + except socket.error as e: # Broken pipe, connection reset by peer if get_errno(e) not in BROKEN_SOCK: raise @@ -518,7 +518,7 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler): def finish(self): try: BaseHTTPServer.BaseHTTPRequestHandler.finish(self) - except socket.error, e: + except socket.error as e: # Broken pipe, connection reset by peer if get_errno(e) not in BROKEN_SOCK: raise @@ -703,7 +703,7 @@ def server(sock, site, " call site to use GreenPool instead" % type(pool), DeprecationWarning, stacklevel=2) pool.execute_async(serv.process_request, client_socket) - except ACCEPT_EXCEPTIONS, e: + except ACCEPT_EXCEPTIONS as e: if get_errno(e) not in ACCEPT_ERRNO: raise except (KeyboardInterrupt, SystemExit): @@ -717,6 +717,6 @@ def server(sock, site, # that far we might as well not bother closing sock at # all. sock.close() - except socket.error, e: + except socket.error as e: if get_errno(e) not in BROKEN_SOCK: traceback.print_exc() diff --git a/examples/chat_server.py b/examples/chat_server.py index 3577e98..3c12c6d 100644 --- a/examples/chat_server.py +++ b/examples/chat_server.py @@ -13,7 +13,7 @@ def read_chat_forever(writer, reader): if p is not writer: # Don't echo p.write(line) p.flush() - except socket.error, e: + except socket.error as e: # ignore broken pipes, they just mean the participant # closed its connection already if e[0] != 32: diff --git a/examples/twisted/twisted_client.py b/examples/twisted/twisted_client.py index 38061aa..78256bd 100644 --- a/examples/twisted/twisted_client.py +++ b/examples/twisted/twisted_client.py @@ -21,6 +21,6 @@ conn.write('GET / HTTP/1.0\r\n\r\n') try: for num, line in enumerate(conn): print '%3s %r' % (num, line) -except ConnectionClosed, ex: +except ConnectionClosed as ex: print ex diff --git a/examples/twisted/twisted_server.py b/examples/twisted/twisted_server.py index 41352f1..f5a3cb6 100644 --- a/examples/twisted/twisted_server.py +++ b/examples/twisted/twisted_server.py @@ -26,7 +26,7 @@ class Chat: for buddy in self.participants: if buddy is not conn: buddy.sendline('from %s: %s' % (peer, line)) - except Exception, ex: + except Exception as ex: print peer, ex else: print peer, 'connection done' diff --git a/examples/zmq_chat.py b/examples/zmq_chat.py index cd07f80..074c326 100644 --- a/examples/zmq_chat.py +++ b/examples/zmq_chat.py @@ -36,7 +36,7 @@ def read_chat_forever(reader, pub_socket): try: pub_socket.send_pyobj((who, line)) - except socket.error, e: + except socket.error as e: # ignore broken pipes, they just mean the participant # closed its connection already if e[0] != 32: diff --git a/tests/greenio_test.py b/tests/greenio_test.py index 082809a..f2c0395 100644 --- a/tests/greenio_test.py +++ b/tests/greenio_test.py @@ -66,10 +66,10 @@ class TestGreenSocket(LimitedTestCase): try: gs.connect(('192.0.2.1', 80)) self.fail("socket.timeout not raised") - except socket.timeout, e: + except socket.timeout as e: self.assert_(hasattr(e, 'args')) self.assertEqual(e.args[0], 'timed out') - except socket.error, e: + except socket.error as e: # unreachable is also a valid outcome if not get_errno(e) in (errno.EHOSTUNREACH, errno.ENETUNREACH): raise @@ -84,7 +84,7 @@ class TestGreenSocket(LimitedTestCase): try: gs.accept() self.fail("socket.timeout not raised") - except socket.timeout, e: + except socket.timeout as e: self.assert_(hasattr(e, 'args')) self.assertEqual(e.args[0], 'timed out') @@ -120,7 +120,7 @@ class TestGreenSocket(LimitedTestCase): try: client.recv(8192) self.fail("socket.timeout not raised") - except socket.timeout, e: + except socket.timeout as e: self.assert_(hasattr(e, 'args')) self.assertEqual(e.args[0], 'timed out') @@ -136,7 +136,7 @@ class TestGreenSocket(LimitedTestCase): try: gs.recvfrom(8192) self.fail("socket.timeout not raised") - except socket.timeout, e: + except socket.timeout as e: self.assert_(hasattr(e, 'args')) self.assertEqual(e.args[0], 'timed out') @@ -151,7 +151,7 @@ class TestGreenSocket(LimitedTestCase): try: gs.recvfrom_into(buf) self.fail("socket.timeout not raised") - except socket.timeout, e: + except socket.timeout as e: self.assert_(hasattr(e, 'args')) self.assertEqual(e.args[0], 'timed out') @@ -181,7 +181,7 @@ class TestGreenSocket(LimitedTestCase): try: client.recv_into(buf) self.fail("socket.timeout not raised") - except socket.timeout, e: + except socket.timeout as e: self.assert_(hasattr(e, 'args')) self.assertEqual(e.args[0], 'timed out') @@ -216,7 +216,7 @@ class TestGreenSocket(LimitedTestCase): for x in range(10): total_sent += client.send(msg) self.fail("socket.timeout not raised") - except socket.timeout, e: + except socket.timeout as e: self.assert_(hasattr(e, 'args')) self.assertEqual(e.args[0], 'timed out') @@ -249,7 +249,7 @@ class TestGreenSocket(LimitedTestCase): # want to exceed the size of the OS buffer so it'll block client.sendall(msg) self.fail("socket.timeout not raised") - except socket.timeout, e: + except socket.timeout as e: self.assert_(hasattr(e, 'args')) self.assertEqual(e.args[0], 'timed out') @@ -504,7 +504,7 @@ class TestGreenSocket(LimitedTestCase): while True: try: sock.sendall('hello world') - except socket.error, e: + except socket.error as e: if get_errno(e) == errno.EPIPE: return raise @@ -519,7 +519,7 @@ class TestGreenSocket(LimitedTestCase): while True: data = client.recv(1024) self.assert_(data) - except socket.error, e: + except socket.error as e: # we get an EBADF because client is closed in the same process # (but a different greenthread) if get_errno(e) != errno.EBADF: @@ -553,7 +553,7 @@ class TestGreenSocket(LimitedTestCase): try: client.recv(1) assert False - except socket.error, e: + except socket.error as e: assert get_errno(e) == errno.EAGAIN client.settimeout(0.05) diff --git a/tests/greenpool_test.py b/tests/greenpool_test.py index ad12602..217764e 100644 --- a/tests/greenpool_test.py +++ b/tests/greenpool_test.py @@ -383,7 +383,7 @@ class Stress(tests.LimitedTestCase): while True: try: i = it.next() - except StressException, exc: + except StressException as exc: i = exc.args[0] except StopIteration: break diff --git a/tests/queue_test.py b/tests/queue_test.py index e4a1c69..2135b19 100644 --- a/tests/queue_test.py +++ b/tests/queue_test.py @@ -257,7 +257,7 @@ class TestQueue(LimitedTestCase): def store_result(result, func, *args): try: result.append(func(*args)) - except Exception, exc: + except Exception as exc: result.append(exc) diff --git a/tests/stdlib/all_modules.py b/tests/stdlib/all_modules.py index 6d07344..71e8c48 100644 --- a/tests/stdlib/all_modules.py +++ b/tests/stdlib/all_modules.py @@ -34,7 +34,7 @@ def get_modules(): s.connect(('eventlet.net', 80)) s.close() test_modules = test_modules + network_modules - except socket.error, e: + except socket.error as e: print "Skipping network tests" return test_modules diff --git a/tests/test__event.py b/tests/test__event.py index e56a51f..99aff9e 100644 --- a/tests/test__event.py +++ b/tests/test__event.py @@ -16,7 +16,7 @@ class TestEvent(LimitedTestCase): try: result = e.wait() log.append(('received', result)) - except Exception, ex: + except Exception as ex: log.append(('catched', ex)) spawn(waiter) sleep(0) # let waiter to block on e.wait() diff --git a/tests/test__greenness.py b/tests/test__greenness.py index 27f507d..db6f0b0 100644 --- a/tests/test__greenness.py +++ b/tests/test__greenness.py @@ -39,7 +39,7 @@ class TestGreenness(unittest.TestCase): try: urllib2.urlopen('http://127.0.0.1:%s' % self.port) assert False, 'should not get there' - except urllib2.HTTPError, ex: + except urllib2.HTTPError as ex: assert ex.code == 501, repr(ex) self.assertEqual(self.server.request_count, 1) diff --git a/tests/test__proc.py b/tests/test__proc.py index 466cf6a..6b8b144 100644 --- a/tests/test__proc.py +++ b/tests/test__proc.py @@ -304,7 +304,7 @@ class TestStuff(LimitedTestCase): b = proc.spawn(lambda : getcurrent().throw(ExpectedError('second'))) try: proc.waitall([a, b]) - except ExpectedError, ex: + except ExpectedError as ex: assert 'second' in str(ex), repr(str(ex)) sleep(0.2) # sleep to ensure that the other timer is raised diff --git a/tests/test__socket_errors.py b/tests/test__socket_errors.py index ad2ad21..195572a 100644 --- a/tests/test__socket_errors.py +++ b/tests/test__socket_errors.py @@ -16,7 +16,7 @@ class TestSocketErrors(unittest.TestCase): try: s.connect(('127.0.0.1', port)) self.fail("Shouldn't have connected") - except socket.error, ex: + except socket.error as ex: code, text = ex.args assert code in [111, 61, 10061], (code, text) assert 'refused' in text.lower(), (code, text) @@ -43,7 +43,7 @@ class TestSocketErrors(unittest.TestCase): try: cs.recv(1024) self.fail("Should have timed out") - except socket.timeout, ex: + except socket.timeout as ex: assert hasattr(ex, 'args') assert len(ex.args) == 1 assert ex.args[0] == 'timed out' diff --git a/tests/timeout_test.py b/tests/timeout_test.py index 006ece7..d0865a8 100644 --- a/tests/timeout_test.py +++ b/tests/timeout_test.py @@ -7,14 +7,14 @@ class TestDirectRaise(LimitedTestCase): def test_direct_raise_class(self): try: raise timeout.Timeout - except timeout.Timeout, t: + except timeout.Timeout as t: assert not t.pending, repr(t) def test_direct_raise_instance(self): tm = timeout.Timeout() try: raise tm - except timeout.Timeout, t: + except timeout.Timeout as t: assert tm is t, (tm, t) assert not t.pending, repr(t) diff --git a/tests/timeout_test_with_statement.py b/tests/timeout_test_with_statement.py index 21779ce..4dbfadc 100644 --- a/tests/timeout_test_with_statement.py +++ b/tests/timeout_test_with_statement.py @@ -32,7 +32,7 @@ class Test(LimitedTestCase): try: with Timeout(DELAY) as t: sleep(DELAY*2) - except Timeout, ex: + except Timeout as ex: assert ex is t, (ex, t) else: raise AssertionError('must raise Timeout') @@ -42,7 +42,7 @@ class Test(LimitedTestCase): try: with Timeout(DELAY, True) as t: sleep(DELAY*2) - except Timeout, ex: + except Timeout as ex: assert ex is t, (ex, t) else: raise AssertionError('must raise Timeout') @@ -52,7 +52,7 @@ class Test(LimitedTestCase): try: with Timeout(DELAY, IOError("Operation takes way too long")): sleep(DELAY*2) - except IOError, ex: + except IOError as ex: assert str(ex)=="Operation takes way too long", repr(ex) def test_raising_exception_class(self): @@ -119,7 +119,7 @@ class Test(LimitedTestCase): with Timeout(DELAY*2) as t2: try: sleep(DELAY*3) - except Timeout, ex: + except Timeout as ex: assert ex is t1, (ex, t1) assert not t1.pending, t1 assert t2.pending, t2 @@ -129,7 +129,7 @@ class Test(LimitedTestCase): with Timeout(DELAY) as t2: try: sleep(DELAY*3) - except Timeout, ex: + except Timeout as ex: assert ex is t2, (ex, t2) assert t1.pending, t1 assert not t2.pending, t2 diff --git a/tests/websocket_test.py b/tests/websocket_test.py index 791ed99..6bc3347 100644 --- a/tests/websocket_test.py +++ b/tests/websocket_test.py @@ -44,7 +44,7 @@ class TestWebSocket(_TestBase): def raiser(): try: urllib2.urlopen("http://localhost:%s/echo" % self.port) - except urllib2.HTTPError, e: + except urllib2.HTTPError as e: self.assertEqual(e.code, 400) raise self.assertRaises(urllib2.HTTPError, raiser) diff --git a/tests/wsgi_test.py b/tests/wsgi_test.py index 00a0e3d..c725c86 100644 --- a/tests/wsgi_test.py +++ b/tests/wsgi_test.py @@ -147,7 +147,7 @@ def read_http(sock): fd = sock.makefile() try: response_line = fd.readline() - except socket.error, exc: + except socket.error as exc: if get_errno(exc) == 10053: raise ConnectionClosed raise @@ -643,7 +643,7 @@ class TestHttpd(_TestBase): try: server_sock_2.accept() # shouldn't be able to use this one anymore - except socket.error, exc: + except socket.error as exc: self.assertEqual(get_errno(exc), errno.EBADF) self.spawn_server(sock=server_sock) sock = eventlet.connect(('localhost', self.port)) @@ -760,7 +760,7 @@ class TestHttpd(_TestBase): try: eventlet.connect(('localhost', self.port)) self.fail("Didn't expect to connect") - except socket.error, exc: + except socket.error as exc: self.assertEquals(get_errno(exc), errno.ECONNREFUSED) self.assert_('Invalid argument' in self.logfile.getvalue(), @@ -855,7 +855,7 @@ class TestHttpd(_TestBase): errored[0] = 'SSL handshake error caused wsgi.server to exit.' except greenthread.greenlet.GreenletExit: pass - except Exception, e: + except Exception as e: errored[0] = 'SSL handshake error raised exception %s.' % e for data in ('', 'GET /non-ssl-request HTTP/1.0\r\n\r\n'): srv_sock = eventlet.wrap_ssl(eventlet.listen(('localhost', 0)), @@ -1217,7 +1217,7 @@ def read_headers(sock): fd = sock.makefile() try: response_line = fd.readline() - except socket.error, exc: + except socket.error as exc: if get_errno(exc) == 10053: raise ConnectionClosed raise diff --git a/tests/zmq_test.py b/tests/zmq_test.py index d4fa715..82ab74a 100644 --- a/tests/zmq_test.py +++ b/tests/zmq_test.py @@ -52,7 +52,7 @@ class TestUpstreamDownStream(LimitedTestCase): def assertRaisesErrno(self, errno, func, *args): try: func(*args) - except zmq.ZMQError, e: + except zmq.ZMQError as e: self.assertEqual(e.errno, errno, "wrong error raised, expected '%s' \ got '%s'" % (zmq.ZMQError(errno), zmq.ZMQError(e.errno))) else: