Fixed Python flake8 offenses
diff --git a/lib/py/src/TTornado.py b/lib/py/src/TTornado.py
index c721830..a701ec9 100644
--- a/lib/py/src/TTornado.py
+++ b/lib/py/src/TTornado.py
@@ -66,6 +66,7 @@
class TTornadoStreamTransport(TTransportBase):
"""a framed, buffered transport over a Tornado stream"""
+
def __init__(self, host, port, stream=None, io_loop=None):
if io_loop is not None:
warnings.warn(
@@ -90,9 +91,9 @@
return gen.with_timeout(timeout, future)
def isOpen(self):
- if self.stream is None:
- return False
- return not self.stream.closed()
+ if self.stream is None:
+ return False
+ return not self.stream.closed()
@gen.coroutine
def open(self, timeout=None):
diff --git a/lib/py/src/protocol/TJSONProtocol.py b/lib/py/src/protocol/TJSONProtocol.py
index a42aaa6..004a40a 100644
--- a/lib/py/src/protocol/TJSONProtocol.py
+++ b/lib/py/src/protocol/TJSONProtocol.py
@@ -21,7 +21,6 @@
TProtocolFactory, checkIntegerLimits)
import base64
import math
-import sys
__all__ = ['TJSONProtocol',
diff --git a/lib/py/src/protocol/TProtocol.py b/lib/py/src/protocol/TProtocol.py
index 5b4f4d8..a0d1452 100644
--- a/lib/py/src/protocol/TProtocol.py
+++ b/lib/py/src/protocol/TProtocol.py
@@ -20,7 +20,6 @@
from thrift.Thrift import TException, TType, TFrozenDict
from thrift.transport.TTransport import TTransportException
-import sys
from itertools import islice
diff --git a/lib/py/src/transport/THttpClient.py b/lib/py/src/transport/THttpClient.py
index 6281165..7d0b0fb 100644
--- a/lib/py/src/transport/THttpClient.py
+++ b/lib/py/src/transport/THttpClient.py
@@ -102,7 +102,7 @@
ap = "%s:%s" % (urllib.parse.unquote(proxy.username),
urllib.parse.unquote(proxy.password))
cr = base64.b64encode(ap.encode()).strip()
- return "Basic " + six.ensure_str(cr)
+ return "Basic " + cr.decode("ascii")
def using_proxy(self):
return self.realhost is not None
diff --git a/lib/py/src/transport/TSSLSocket.py b/lib/py/src/transport/TSSLSocket.py
index dc6c1fb..896d69c 100644
--- a/lib/py/src/transport/TSSLSocket.py
+++ b/lib/py/src/transport/TSSLSocket.py
@@ -28,7 +28,10 @@
from thrift.transport import TSocket
from thrift.transport.TTransport import TTransportException
-_match_hostname = lambda cert, hostname: True
+
+def _match_hostname(cert, hostname):
+ return True
+
logger = logging.getLogger(__name__)
warnings.filterwarnings(
@@ -356,7 +359,7 @@
# Preserve existing behaviors for default values
if 'cert_reqs' not in kwargs:
kwargs['cert_reqs'] = ssl.CERT_NONE
- if'certfile' not in kwargs:
+ if 'certfile' not in kwargs:
kwargs['certfile'] = 'cert.pem'
unix_socket = kwargs.pop('unix_socket', None)
diff --git a/lib/py/src/transport/sslcompat.py b/lib/py/src/transport/sslcompat.py
index 54235ec..f4425d0 100644
--- a/lib/py/src/transport/sslcompat.py
+++ b/lib/py/src/transport/sslcompat.py
@@ -97,7 +97,8 @@
# 3.7. OpenSSL performs hostname matching since Python 3.7, Python no
# longer uses the ssl.match_hostname() function.""
if sys.version_info[0] > 3 or (sys.version_info[0] == 3 and sys.version_info[1] >= 12):
- match = lambda cert, hostname: True
+ def match(cert, hostname):
+ return True
else:
logger.warning('using legacy validation callback')
match = legacy_validate_callback