From: Ben Darnell Date: Mon, 14 Jan 2013 00:16:33 +0000 (-0500) Subject: Change "except Type, value" to "except Type as value". X-Git-Tag: v3.0.0~182 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d693ee09dc6ea91f0e7d3ebad37e11e4cc5be89;p=thirdparty%2Ftornado.git Change "except Type, value" to "except Type as value". Necessary for py3, supported since py26. 2to3 -n -w -f except tornado --- diff --git a/tornado/autoreload.py b/tornado/autoreload.py index 62af0f3b0..e7c5d481a 100644 --- a/tornado/autoreload.py +++ b/tornado/autoreload.py @@ -278,10 +278,10 @@ def main(): # something that tries to import __main__ (e.g. the unittest # module) will see the right things. exec f.read() in globals(), globals() - except SystemExit, e: + except SystemExit as e: logging.basicConfig() gen_log.info("Script exited with status %s", e.code) - except Exception, e: + except Exception as e: logging.basicConfig() gen_log.warning("Script exited with uncaught exception", exc_info=True) # If an exception occurred at import time, the file with the error diff --git a/tornado/concurrent.py b/tornado/concurrent.py index 80596844d..c1a9593c2 100644 --- a/tornado/concurrent.py +++ b/tornado/concurrent.py @@ -94,7 +94,7 @@ class DummyExecutor(object): future = Future() try: future.set_result(fn(*args, **kwargs)) - except Exception, e: + except Exception as e: future.set_exception(e) return future diff --git a/tornado/curl_httpclient.py b/tornado/curl_httpclient.py index 52350d246..ebf54ae9f 100644 --- a/tornado/curl_httpclient.py +++ b/tornado/curl_httpclient.py @@ -128,7 +128,7 @@ class CurlAsyncHTTPClient(AsyncHTTPClient): while True: try: ret, num_handles = self._socket_action(fd, action) - except pycurl.error, e: + except pycurl.error as e: ret = e.args[0] if ret != pycurl.E_CALL_MULTI_PERFORM: break @@ -142,7 +142,7 @@ class CurlAsyncHTTPClient(AsyncHTTPClient): try: ret, num_handles = self._socket_action( pycurl.SOCKET_TIMEOUT, 0) - except pycurl.error, e: + except pycurl.error as e: ret = e.args[0] if ret != pycurl.E_CALL_MULTI_PERFORM: break @@ -173,7 +173,7 @@ class CurlAsyncHTTPClient(AsyncHTTPClient): while True: try: ret, num_handles = self._multi.socket_all() - except pycurl.error, e: + except pycurl.error as e: ret = e.args[0] if ret != pycurl.E_CALL_MULTI_PERFORM: break diff --git a/tornado/httpclient.py b/tornado/httpclient.py index 7359a76ce..dadb4d440 100644 --- a/tornado/httpclient.py +++ b/tornado/httpclient.py @@ -440,7 +440,7 @@ def main(): follow_redirects=options.follow_redirects, validate_cert=options.validate_cert, ) - except HTTPError, e: + except HTTPError as e: if e.response is not None: response = e.response else: diff --git a/tornado/httpserver.py b/tornado/httpserver.py index af441d930..47120ca59 100644 --- a/tornado/httpserver.py +++ b/tornado/httpserver.py @@ -283,7 +283,7 @@ class HTTPConnection(object): return self.request_callback(self._request) - except _BadRequestException, e: + except _BadRequestException as e: gen_log.info("Malformed HTTP request from %s: %s", self.address[0], e) self.close() @@ -484,7 +484,7 @@ class HTTPRequest(object): socket.SOCK_STREAM, 0, socket.AI_NUMERICHOST) return bool(res) - except socket.gaierror, e: + except socket.gaierror as e: if e.args[0] == socket.EAI_NONAME: return False raise diff --git a/tornado/ioloop.py b/tornado/ioloop.py index 5e42147e4..ef44decc6 100644 --- a/tornado/ioloop.py +++ b/tornado/ioloop.py @@ -543,7 +543,7 @@ class PollIOLoop(IOLoop): try: event_pairs = self._impl.poll(poll_timeout) - except Exception, e: + except Exception as e: # Depending on python version and IOLoop implementation, # different exception types may be thrown and there are # two ways EINTR might be signaled: @@ -569,7 +569,7 @@ class PollIOLoop(IOLoop): fd, events = self._events.popitem() try: self._handlers[fd](fd, events) - except (OSError, IOError), e: + except (OSError, IOError) as e: if e.args[0] == errno.EPIPE: # Happens when the client closes the connection pass diff --git a/tornado/iostream.py b/tornado/iostream.py index 6eec2a357..f090bc6dd 100644 --- a/tornado/iostream.py +++ b/tornado/iostream.py @@ -399,7 +399,7 @@ class BaseIOStream(object): """ try: chunk = self.read_from_fd() - except (socket.error, IOError, OSError), e: + except (socket.error, IOError, OSError) as e: # ssl.SSLError is a subclass of socket.error if e.args[0] == errno.ECONNRESET: # Treat ECONNRESET as a connection close rather than @@ -504,7 +504,7 @@ class BaseIOStream(object): self._write_buffer_frozen = False _merge_prefix(self._write_buffer, num_bytes) self._write_buffer.popleft() - except socket.error, e: + except socket.error as e: if e.args[0] in (errno.EWOULDBLOCK, errno.EAGAIN): self._write_buffer_frozen = True break @@ -630,7 +630,7 @@ class IOStream(BaseIOStream): def read_from_fd(self): try: chunk = self.socket.recv(self.read_chunk_size) - except socket.error, e: + except socket.error as e: if e.args[0] in (errno.EWOULDBLOCK, errno.EAGAIN): return None else: @@ -661,7 +661,7 @@ class IOStream(BaseIOStream): self._connecting = True try: self.socket.connect(address) - except socket.error, e: + except socket.error as e: # In non-blocking mode we expect connect() to raise an # exception with EINPROGRESS or EWOULDBLOCK. # @@ -732,7 +732,7 @@ class SSLIOStream(IOStream): self._handshake_reading = False self._handshake_writing = False self.socket.do_handshake() - except ssl.SSLError, err: + except ssl.SSLError as err: if err.args[0] == ssl.SSL_ERROR_WANT_READ: self._handshake_reading = True return @@ -751,7 +751,7 @@ class SSLIOStream(IOStream): self.socket.fileno(), peer, err) return self.close(exc_info=True) raise - except socket.error, err: + except socket.error as err: if err.args[0] in (errno.ECONNABORTED, errno.ECONNRESET): return self.close(exc_info=True) else: @@ -804,14 +804,14 @@ class SSLIOStream(IOStream): # called when there is nothing to read, so we have to use # read() instead. chunk = self.socket.read(self.read_chunk_size) - except ssl.SSLError, e: + except ssl.SSLError as e: # SSLError is a subclass of socket.error, so this except # block must come first. if e.args[0] == ssl.SSL_ERROR_WANT_READ: return None else: raise - except socket.error, e: + except socket.error as e: if e.args[0] in (errno.EWOULDBLOCK, errno.EAGAIN): return None else: @@ -844,7 +844,7 @@ class PipeIOStream(BaseIOStream): def read_from_fd(self): try: chunk = os.read(self.fd, self.read_chunk_size) - except (IOError, OSError), e: + except (IOError, OSError) as e: if e.args[0] in (errno.EWOULDBLOCK, errno.EAGAIN): return None elif e.args[0] == errno.EBADF: diff --git a/tornado/locale.py b/tornado/locale.py index c5d49db65..e44875b30 100644 --- a/tornado/locale.py +++ b/tornado/locale.py @@ -184,7 +184,7 @@ def load_gettext_translations(directory, domain): os.stat(os.path.join(directory, lang, "LC_MESSAGES", domain + ".mo")) _translations[lang] = gettext.translation(domain, directory, languages=[lang]) - except Exception, e: + except Exception as e: gen_log.error("Cannot load translation for '%s': %s", lang, str(e)) continue _supported_locales = frozenset(_translations.keys() + [_default_locale]) diff --git a/tornado/log.py b/tornado/log.py index 72433536b..f7b74fe95 100644 --- a/tornado/log.py +++ b/tornado/log.py @@ -102,7 +102,7 @@ class LogFormatter(logging.Formatter): def format(self, record): try: record.message = record.getMessage() - except Exception, e: + except Exception as e: record.message = "Bad message (%r): %r" % (e, record.__dict__) assert isinstance(record.message, basestring) # guaranteed by logging record.asctime = time.strftime( diff --git a/tornado/netutil.py b/tornado/netutil.py index 291dbecd9..0375cab3a 100644 --- a/tornado/netutil.py +++ b/tornado/netutil.py @@ -218,12 +218,12 @@ class TCPServer(object): server_side=True, do_handshake_on_connect=False, **self.ssl_options) - except ssl.SSLError, err: + except ssl.SSLError as err: if err.args[0] == ssl.SSL_ERROR_EOF: return connection.close() else: raise - except socket.error, err: + except socket.error as err: if err.args[0] == errno.ECONNABORTED: return connection.close() else: @@ -304,7 +304,7 @@ if hasattr(socket, 'AF_UNIX'): sock.setblocking(0) try: st = os.stat(file) - except OSError, err: + except OSError as err: if err.errno != errno.ENOENT: raise else: @@ -334,7 +334,7 @@ def add_accept_handler(sock, callback, io_loop=None): while True: try: connection, address = sock.accept() - except socket.error, e: + except socket.error as e: if e.args[0] in (errno.EWOULDBLOCK, errno.EAGAIN): return raise diff --git a/tornado/platform/common.py b/tornado/platform/common.py index 39f60bd79..a01f3789e 100644 --- a/tornado/platform/common.py +++ b/tornado/platform/common.py @@ -43,7 +43,7 @@ class Waker(interface.Waker): try: self.writer.connect(connect_address) break # success - except socket.error, detail: + except socket.error as detail: if (not hasattr(errno, 'WSAEADDRINUSE') or detail[0] != errno.WSAEADDRINUSE): # "Address already in use" is the only error diff --git a/tornado/process.py b/tornado/process.py index fa0be555f..f8f532ce4 100644 --- a/tornado/process.py +++ b/tornado/process.py @@ -125,7 +125,7 @@ def fork_processes(num_processes, max_restarts=100): while children: try: pid, status = os.wait() - except OSError, e: + except OSError as e: if e.errno == errno.EINTR: continue raise @@ -260,7 +260,7 @@ class Subprocess(object): def _try_cleanup_process(cls, pid): try: ret_pid, status = os.waitpid(pid, os.WNOHANG) - except OSError, e: + except OSError as e: if e.args[0] == errno.ECHILD: return if ret_pid == 0: diff --git a/tornado/test/concurrent_test.py b/tornado/test/concurrent_test.py index 5267358ad..a33f4a580 100644 --- a/tornado/test/concurrent_test.py +++ b/tornado/test/concurrent_test.py @@ -83,7 +83,7 @@ class ManualCapClient(BaseCapClient): self.stream.close() try: self.future.set_result(self.process_response(data)) - except CapError, e: + except CapError as e: self.future.set_exception(e) diff --git a/tornado/test/ioloop_test.py b/tornado/test/ioloop_test.py index 53bb8a449..d3efb4424 100644 --- a/tornado/test/ioloop_test.py +++ b/tornado/test/ioloop_test.py @@ -110,7 +110,7 @@ class TestIOLoop(AsyncTestCase): for i in range(1000): try: other_ioloop.add_callback(lambda: None) - except RuntimeError, e: + except RuntimeError as e: self.assertEqual("IOLoop is closing", str(e)) break diff --git a/tornado/test/process_test.py b/tornado/test/process_test.py index 43748ebc9..2ea33841c 100644 --- a/tornado/test/process_test.py +++ b/tornado/test/process_test.py @@ -69,7 +69,7 @@ class ProcessTest(unittest.TestCase): id = fork_processes(3, max_restarts=3) self.assertTrue(id is not None) signal.alarm(5) # child processes - except SystemExit, e: + except SystemExit as e: # if we exit cleanly from fork_processes, all the child processes # finished with status 0 self.assertEqual(e.code, 0) @@ -94,7 +94,7 @@ class ProcessTest(unittest.TestCase): def fetch(url, fail_ok=False): try: return client.fetch(get_url(url)) - except HTTPError, e: + except HTTPError as e: if not (fail_ok and e.code == 599): raise diff --git a/tornado/test/simple_httpclient_test.py b/tornado/test/simple_httpclient_test.py index e0e6d376b..66faed1e4 100644 --- a/tornado/test/simple_httpclient_test.py +++ b/tornado/test/simple_httpclient_test.py @@ -223,7 +223,7 @@ class SimpleHTTPClientTestCase(AsyncHTTPTestCase): def test_ipv6(self): try: self.http_server.listen(self.get_http_port(), address='::1') - except socket.gaierror, e: + except socket.gaierror as e: if e.args[0] == socket.EAI_ADDRFAMILY: # python supports ipv6, but it's not configured on the network # interface, so skip this test. diff --git a/tornado/test/util_test.py b/tornado/test/util_test.py index aa1bf09bf..068f8d9f3 100644 --- a/tornado/test/util_test.py +++ b/tornado/test/util_test.py @@ -24,7 +24,7 @@ class RaiseExcInfoTest(unittest.TestCase): try: raise_exc_info(exc_info) self.fail("didn't get expected exception") - except TwoArgException, e: + except TwoArgException as e: self.assertIs(e, exc_info[1]) class TestConfigurable(Configurable): diff --git a/tornado/test/web_test.py b/tornado/test/web_test.py index cb370296c..255a85b1b 100644 --- a/tornado/test/web_test.py +++ b/tornado/test/web_test.py @@ -460,7 +460,7 @@ class HeaderInjectionHandler(RequestHandler): try: self.set_header("X-Foo", "foo\r\nX-Bar: baz") raise Exception("Didn't get expected exception") - except ValueError, e: + except ValueError as e: if "Unsafe header value" in str(e): self.finish(b("ok")) else: diff --git a/tornado/testing.py b/tornado/testing.py index 22376627e..bca68999d 100644 --- a/tornado/testing.py +++ b/tornado/testing.py @@ -509,7 +509,7 @@ def main(**kwargs): unittest.main(module=None, argv=argv, **kwargs) else: unittest.main(defaultTest="all", argv=argv, **kwargs) - except SystemExit, e: + except SystemExit as e: if e.code == 0: gen_log.info('PASS') else: diff --git a/tornado/web.py b/tornado/web.py index 41ce95d4b..446a330c2 100644 --- a/tornado/web.py +++ b/tornado/web.py @@ -1007,7 +1007,7 @@ class RequestHandler(object): def wrapper(*args, **kwargs): try: return callback(*args, **kwargs) - except Exception, e: + except Exception as e: if self._headers_written: app_log.error("Exception after headers written", exc_info=True) @@ -1067,7 +1067,7 @@ class RequestHandler(object): *self.path_args, **self.path_kwargs) if self._auto_finish and not self._finished: self.finish() - except Exception, e: + except Exception as e: self._handle_request_exception(e) def _generate_headers(self):