You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jf...@apache.org on 2015/03/19 02:03:29 UTC
thrift git commit: Thrift-1784: pep-3110 exception handling Client:
py Patch: jfarrell
Repository: thrift
Updated Branches:
refs/heads/master 43ceaf7cf -> d565e2f49
Thrift-1784: pep-3110 exception handling
Client: py
Patch: jfarrell
Updates python lib for pep-3110
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/d565e2f4
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/d565e2f4
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/d565e2f4
Branch: refs/heads/master
Commit: d565e2f496ab894e737b143cf71c2f5e3cee871b
Parents: 43ceaf7
Author: jfarrell <jf...@apache.org>
Authored: Wed Mar 18 21:02:47 2015 -0400
Committer: jfarrell <jf...@apache.org>
Committed: Wed Mar 18 21:02:47 2015 -0400
----------------------------------------------------------------------
lib/py/src/server/THttpServer.py | 2 +-
lib/py/src/server/TProcessPoolServer.py | 10 +++++-----
lib/py/src/server/TServer.py | 30 ++++++++++++++--------------
lib/py/src/transport/TSSLSocket.py | 6 +++---
lib/py/src/transport/TSocket.py | 8 ++++----
5 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/d565e2f4/lib/py/src/server/THttpServer.py
----------------------------------------------------------------------
diff --git a/lib/py/src/server/THttpServer.py b/lib/py/src/server/THttpServer.py
index be54bab..6f92173 100644
--- a/lib/py/src/server/THttpServer.py
+++ b/lib/py/src/server/THttpServer.py
@@ -73,7 +73,7 @@ class THttpServer(TServer.TServer):
oprot = thttpserver.outputProtocolFactory.getProtocol(otrans)
try:
thttpserver.processor.process(iprot, oprot)
- except ResponseException, exn:
+ except ResponseException as exn:
exn.handler(self)
else:
self.send_response(200)
http://git-wip-us.apache.org/repos/asf/thrift/blob/d565e2f4/lib/py/src/server/TProcessPoolServer.py
----------------------------------------------------------------------
diff --git a/lib/py/src/server/TProcessPoolServer.py b/lib/py/src/server/TProcessPoolServer.py
index eefb623..ae7fe1c 100644
--- a/lib/py/src/server/TProcessPoolServer.py
+++ b/lib/py/src/server/TProcessPoolServer.py
@@ -63,7 +63,7 @@ class TProcessPoolServer(TServer):
self.serveClient(client)
except (KeyboardInterrupt, SystemExit):
return 0
- except Exception, x:
+ except Exception as x:
logger.exception(x)
def serveClient(self, client):
@@ -76,9 +76,9 @@ class TProcessPoolServer(TServer):
try:
while True:
self.processor.process(iprot, oprot)
- except TTransportException, tx:
+ except TTransportException as tx:
pass
- except Exception, x:
+ except Exception as x:
logger.exception(x)
itrans.close()
@@ -99,7 +99,7 @@ class TProcessPoolServer(TServer):
w.daemon = True
w.start()
self.workers.append(w)
- except Exception, x:
+ except Exception as x:
logger.exception(x)
# wait until the condition is set by stop()
@@ -110,7 +110,7 @@ class TProcessPoolServer(TServer):
break
except (SystemExit, KeyboardInterrupt):
break
- except Exception, x:
+ except Exception as x:
logger.exception(x)
self.isRunning.value = False
http://git-wip-us.apache.org/repos/asf/thrift/blob/d565e2f4/lib/py/src/server/TServer.py
----------------------------------------------------------------------
diff --git a/lib/py/src/server/TServer.py b/lib/py/src/server/TServer.py
index 00fd8cf..8c58e39 100644
--- a/lib/py/src/server/TServer.py
+++ b/lib/py/src/server/TServer.py
@@ -86,9 +86,9 @@ class TSimpleServer(TServer):
try:
while True:
self.processor.process(iprot, oprot)
- except TTransport.TTransportException, tx:
+ except TTransport.TTransportException as tx:
pass
- except Exception, x:
+ except Exception as x:
logger.exception(x)
itrans.close()
@@ -114,7 +114,7 @@ class TThreadedServer(TServer):
t.start()
except KeyboardInterrupt:
raise
- except Exception, x:
+ except Exception as x:
logger.exception(x)
def handle(self, client):
@@ -125,9 +125,9 @@ class TThreadedServer(TServer):
try:
while True:
self.processor.process(iprot, oprot)
- except TTransport.TTransportException, tx:
+ except TTransport.TTransportException as tx:
pass
- except Exception, x:
+ except Exception as x:
logger.exception(x)
itrans.close()
@@ -153,7 +153,7 @@ class TThreadPoolServer(TServer):
try:
client = self.clients.get()
self.serveClient(client)
- except Exception, x:
+ except Exception as x:
logger.exception(x)
def serveClient(self, client):
@@ -165,9 +165,9 @@ class TThreadPoolServer(TServer):
try:
while True:
self.processor.process(iprot, oprot)
- except TTransport.TTransportException, tx:
+ except TTransport.TTransportException as tx:
pass
- except Exception, x:
+ except Exception as x:
logger.exception(x)
itrans.close()
@@ -180,7 +180,7 @@ class TThreadPoolServer(TServer):
t = threading.Thread(target=self.serveThread)
t.setDaemon(self.daemon)
t.start()
- except Exception, x:
+ except Exception as x:
logger.exception(x)
# Pump the socket for clients
@@ -191,7 +191,7 @@ class TThreadPoolServer(TServer):
if not client:
continue
self.clients.put(client)
- except Exception, x:
+ except Exception as x:
logger.exception(x)
@@ -216,7 +216,7 @@ class TForkingServer(TServer):
def try_close(file):
try:
file.close()
- except IOError, e:
+ except IOError as e:
logger.warning(e, exc_info=True)
self.serverTransport.listen()
@@ -250,9 +250,9 @@ class TForkingServer(TServer):
try:
while True:
self.processor.process(iprot, oprot)
- except TTransport.TTransportException, tx:
+ except TTransport.TTransportException as tx:
pass
- except Exception, e:
+ except Exception as e:
logger.exception(e)
ecode = 1
finally:
@@ -261,9 +261,9 @@ class TForkingServer(TServer):
os._exit(ecode)
- except TTransport.TTransportException, tx:
+ except TTransport.TTransportException as tx:
pass
- except Exception, x:
+ except Exception as x:
logger.exception(x)
def collect_children(self):
http://git-wip-us.apache.org/repos/asf/thrift/blob/d565e2f4/lib/py/src/transport/TSSLSocket.py
----------------------------------------------------------------------
diff --git a/lib/py/src/transport/TSSLSocket.py b/lib/py/src/transport/TSSLSocket.py
index c01886d..6ad8d50 100644
--- a/lib/py/src/transport/TSSLSocket.py
+++ b/lib/py/src/transport/TSSLSocket.py
@@ -102,13 +102,13 @@ class TSSLSocket(TSocket.TSocket):
self.handle.settimeout(self._timeout)
try:
self.handle.connect(ip_port)
- except socket.error, e:
+ except socket.error as e:
if res is not res0[-1]:
continue
else:
raise e
break
- except socket.error, e:
+ except socket.error as e:
if self._unix_socket:
message = 'Could not connect to secure socket %s: %s' \
% (self._unix_socket, e)
@@ -213,7 +213,7 @@ class TSSLServerSocket(TSocket.TServerSocket):
client = ssl.wrap_socket(plain_client, certfile=self.certfile,
server_side=True, ssl_version=self.SSL_VERSION,
ciphers=self.ciphers)
- except ssl.SSLError, ssl_exc:
+ except ssl.SSLError as ssl_exc:
# failed handshake/ssl wrap, close socket to client
plain_client.close()
# raise ssl_exc
http://git-wip-us.apache.org/repos/asf/thrift/blob/d565e2f4/lib/py/src/transport/TSocket.py
----------------------------------------------------------------------
diff --git a/lib/py/src/transport/TSocket.py b/lib/py/src/transport/TSocket.py
index 0175bdc..7b564aa 100644
--- a/lib/py/src/transport/TSocket.py
+++ b/lib/py/src/transport/TSocket.py
@@ -86,13 +86,13 @@ class TSocket(TSocketBase):
self.handle.settimeout(self._timeout)
try:
self.handle.connect(res[4])
- except socket.error, e:
+ except socket.error as e:
if res is not res0[-1]:
continue
else:
raise e
break
- except socket.error, e:
+ except socket.error as e:
if self._unix_socket:
message = 'Could not connect to socket %s' % self._unix_socket
else:
@@ -103,7 +103,7 @@ class TSocket(TSocketBase):
def read(self, sz):
try:
buff = self.handle.recv(sz)
- except socket.error, e:
+ except socket.error as e:
if (e.args[0] == errno.ECONNRESET and
(sys.platform == 'darwin' or sys.platform.startswith('freebsd'))):
# freebsd and Mach don't follow POSIX semantic of recv
@@ -161,7 +161,7 @@ class TServerSocket(TSocketBase, TServerTransportBase):
tmp = socket.socket(res[0], res[1])
try:
tmp.connect(res[4])
- except socket.error, err:
+ except socket.error as err:
eno, message = err.args
if eno == errno.ECONNREFUSED:
os.unlink(res[4])