THRIFT-1857 Python 3 Support
Client: Python
Patch: Thomas Bartelmess, Eevee (Alex Munroe), helgridly, Christian Verkerk, Jeroen Vlek, Nobuaki Sukegawa
This closes #213 and closes #680
diff --git a/lib/py/src/server/TServer.py b/lib/py/src/server/TServer.py
index 8c58e39..130f730 100644
--- a/lib/py/src/server/TServer.py
+++ b/lib/py/src/server/TServer.py
@@ -17,7 +17,7 @@
# under the License.
#
-import Queue
+from six.moves import queue
import os
import sys
import threading
@@ -139,7 +139,7 @@
def __init__(self, *args, **kwargs):
TServer.__init__(self, *args)
- self.clients = Queue.Queue()
+ self.clients = queue.Queue()
self.threads = 10
self.daemon = kwargs.get("daemon", False)
@@ -250,7 +250,7 @@
try:
while True:
self.processor.process(iprot, oprot)
- except TTransport.TTransportException as tx:
+ except TTransport.TTransportException:
pass
except Exception as e:
logger.exception(e)
@@ -261,7 +261,7 @@
os._exit(ecode)
- except TTransport.TTransportException as tx:
+ except TTransport.TTransportException:
pass
except Exception as x:
logger.exception(x)