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
diff --git a/lib/py/test/fuzz/fuzz_common.py b/lib/py/test/fuzz/fuzz_common.py
index 33c8138..3fcbca9 100644
--- a/lib/py/test/fuzz/fuzz_common.py
+++ b/lib/py/test/fuzz/fuzz_common.py
@@ -22,6 +22,7 @@
import os
import atheris
+
def setup_thrift_imports():
"""Set up the Python path to include Thrift libraries and generated code."""
@@ -48,19 +49,21 @@
sys.path.append(gen_path)
print(sys.path)
+
setup_thrift_imports()
from thrift.transport import TTransport
from thrift.TSerialization import serialize, deserialize
from fuzz.ttypes import FuzzTest
+
def create_parser_fuzzer(protocol_factory_class):
"""
Create a parser fuzzer function for a specific protocol.
-
+
Args:
protocol_factory_class: The Thrift protocol factory class to use
-
+
Returns:
A function that can be used with atheris.Setup()
"""
@@ -71,25 +74,26 @@
try:
# Create a memory buffer with the fuzzed data
buf = TTransport.TMemoryBuffer(data)
- transport = TTransport.TBufferedTransportFactory().getTransport(buf)
+ TTransport.TBufferedTransportFactory().getTransport(buf)
factory = protocol_factory_class(string_length_limit=1000, container_length_limit=1000)
# Try to deserialize the fuzzed data into the test class
- test_instance = deserialize(FuzzTest(), data, factory)
+ deserialize(FuzzTest(), data, factory)
- except Exception as e:
+ except Exception:
# We expect various exceptions during fuzzing
pass
return TestOneInput
+
def create_roundtrip_fuzzer(protocol_factory_class):
"""
Create a roundtrip fuzzer function for a specific protocol.
-
+
Args:
protocol_factory_class: The Thrift protocol factory class to use
-
+
Returns:
A function that can be used with atheris.Setup()
"""
@@ -100,7 +104,7 @@
try:
# Create a memory buffer with the fuzzed data
buf = TTransport.TMemoryBuffer(data)
- transport = TTransport.TBufferedTransportFactory().getTransport(buf)
+ TTransport.TBufferedTransportFactory().getTransport(buf)
factory = protocol_factory_class(string_length_limit=1000, container_length_limit=1000)
# Try to deserialize the fuzzed data into the test class
@@ -112,18 +116,19 @@
# Verify the objects are equal after a second deserialization
assert test_instance == deserialized
- except AssertionError as e:
- raise e
- except Exception as e:
+ except AssertionError:
+ raise
+ except Exception:
# We expect various exceptions during fuzzing
pass
return TestOneInput
+
def _run_fuzzer(fuzzer_function):
"""
Set up and run the fuzzer for a specific protocol.
-
+
Args:
fuzzer_function: The fuzzer function to use
"""
@@ -136,7 +141,7 @@
def run_roundtrip_fuzzer(protocol_factory_class):
"""
Set up and run the fuzzer for a specific protocol.
-
+
Args:
protocol_factory_class: The Thrift protocol factory class to use
"""
@@ -146,8 +151,8 @@
def run_parser_fuzzer(protocol_factory_class):
"""
Set up and run the fuzzer for a specific protocol.
-
+
Args:
protocol_factory_class: The Thrift protocol factory class to use
"""
- _run_fuzzer(create_parser_fuzzer(protocol_factory_class))
\ No newline at end of file
+ _run_fuzzer(create_parser_fuzzer(protocol_factory_class))
diff --git a/lib/py/test/fuzz/fuzz_parse_TBinaryProtocol.py b/lib/py/test/fuzz/fuzz_parse_TBinaryProtocol.py
index a07de28..ecdf056 100644
--- a/lib/py/test/fuzz/fuzz_parse_TBinaryProtocol.py
+++ b/lib/py/test/fuzz/fuzz_parse_TBinaryProtocol.py
@@ -20,8 +20,10 @@
from fuzz_common import run_parser_fuzzer
from thrift.protocol.TBinaryProtocol import TBinaryProtocolFactory
+
def main():
run_parser_fuzzer(TBinaryProtocolFactory)
+
if __name__ == "__main__":
main()
diff --git a/lib/py/test/fuzz/fuzz_parse_TBinaryProtocolAccelerated.py b/lib/py/test/fuzz/fuzz_parse_TBinaryProtocolAccelerated.py
index 7c4f046..61c5e92 100644
--- a/lib/py/test/fuzz/fuzz_parse_TBinaryProtocolAccelerated.py
+++ b/lib/py/test/fuzz/fuzz_parse_TBinaryProtocolAccelerated.py
@@ -20,8 +20,10 @@
from fuzz_common import run_parser_fuzzer
from thrift.protocol.TBinaryProtocol import TBinaryProtocolAcceleratedFactory
+
def main():
run_parser_fuzzer(TBinaryProtocolAcceleratedFactory)
+
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
diff --git a/lib/py/test/fuzz/fuzz_parse_TCompactProtocol.py b/lib/py/test/fuzz/fuzz_parse_TCompactProtocol.py
index ff05ec1..a8ebc51 100644
--- a/lib/py/test/fuzz/fuzz_parse_TCompactProtocol.py
+++ b/lib/py/test/fuzz/fuzz_parse_TCompactProtocol.py
@@ -20,8 +20,10 @@
from fuzz_common import run_parser_fuzzer
from thrift.protocol.TCompactProtocol import TCompactProtocolFactory
+
def main():
run_parser_fuzzer(TCompactProtocolFactory)
+
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
diff --git a/lib/py/test/fuzz/fuzz_parse_TCompactProtocolAccelerated.py b/lib/py/test/fuzz/fuzz_parse_TCompactProtocolAccelerated.py
index 04ab96f..a7b8635 100644
--- a/lib/py/test/fuzz/fuzz_parse_TCompactProtocolAccelerated.py
+++ b/lib/py/test/fuzz/fuzz_parse_TCompactProtocolAccelerated.py
@@ -20,8 +20,10 @@
from fuzz_common import run_parser_fuzzer
from thrift.protocol.TCompactProtocol import TCompactProtocolAcceleratedFactory
+
def main():
run_parser_fuzzer(TCompactProtocolAcceleratedFactory)
+
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
diff --git a/lib/py/test/fuzz/fuzz_roundtrip_TBinaryProtocol.py b/lib/py/test/fuzz/fuzz_roundtrip_TBinaryProtocol.py
index 7413707..a2cdafd 100644
--- a/lib/py/test/fuzz/fuzz_roundtrip_TBinaryProtocol.py
+++ b/lib/py/test/fuzz/fuzz_roundtrip_TBinaryProtocol.py
@@ -20,8 +20,10 @@
from fuzz_common import run_roundtrip_fuzzer
from thrift.protocol.TBinaryProtocol import TBinaryProtocolFactory
+
def main():
run_roundtrip_fuzzer(TBinaryProtocolFactory)
+
if __name__ == "__main__":
main()
diff --git a/lib/py/test/fuzz/fuzz_roundtrip_TBinaryProtocolAccelerated.py b/lib/py/test/fuzz/fuzz_roundtrip_TBinaryProtocolAccelerated.py
index 76f3114..4cd0b74 100644
--- a/lib/py/test/fuzz/fuzz_roundtrip_TBinaryProtocolAccelerated.py
+++ b/lib/py/test/fuzz/fuzz_roundtrip_TBinaryProtocolAccelerated.py
@@ -20,8 +20,10 @@
from fuzz_common import run_roundtrip_fuzzer
from thrift.protocol.TBinaryProtocol import TBinaryProtocolAcceleratedFactory
+
def main():
run_roundtrip_fuzzer(TBinaryProtocolAcceleratedFactory)
+
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
diff --git a/lib/py/test/fuzz/fuzz_roundtrip_TCompactProtocol.py b/lib/py/test/fuzz/fuzz_roundtrip_TCompactProtocol.py
index 0fb9cce..a70270e 100644
--- a/lib/py/test/fuzz/fuzz_roundtrip_TCompactProtocol.py
+++ b/lib/py/test/fuzz/fuzz_roundtrip_TCompactProtocol.py
@@ -20,8 +20,10 @@
from fuzz_common import run_roundtrip_fuzzer
from thrift.protocol.TCompactProtocol import TCompactProtocolFactory
+
def main():
run_roundtrip_fuzzer(TCompactProtocolFactory)
+
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
diff --git a/lib/py/test/fuzz/fuzz_roundtrip_TCompactProtocolAccelerated.py b/lib/py/test/fuzz/fuzz_roundtrip_TCompactProtocolAccelerated.py
index 0465b2b..d0f4c57 100644
--- a/lib/py/test/fuzz/fuzz_roundtrip_TCompactProtocolAccelerated.py
+++ b/lib/py/test/fuzz/fuzz_roundtrip_TCompactProtocolAccelerated.py
@@ -20,8 +20,10 @@
from fuzz_common import run_roundtrip_fuzzer
from thrift.protocol.TCompactProtocol import TCompactProtocolAcceleratedFactory
+
def main():
run_roundtrip_fuzzer(TCompactProtocolAcceleratedFactory)
+
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
diff --git a/lib/py/test/test_socket.py b/lib/py/test/test_socket.py
index 5e25f1a..397c9bd 100644
--- a/lib/py/test/test_socket.py
+++ b/lib/py/test/test_socket.py
@@ -32,7 +32,7 @@
class TSocketTest(unittest.TestCase):
def test_failed_connection_raises_exception(self):
- sock = TSocket(host="localhost", port=60606) # unused port
+ sock = TSocket(host="localhost", port=60606) # unused port
with self.assertRaises(TTransportException) as ctx:
sock.open()
exc = ctx.exception
@@ -55,7 +55,7 @@
exc = ctx.exception
self.assertEqual(exc.message, "read timeout")
- acc.client.close() # this also blocks until the other thread is done
+ acc.client.close() # this also blocks until the other thread is done
acc.close()
sock.close()
diff --git a/lib/py/test/thrift_TBinaryProtocol.py b/lib/py/test/thrift_TBinaryProtocol.py
index b257626..c4777ad 100644
--- a/lib/py/test/thrift_TBinaryProtocol.py
+++ b/lib/py/test/thrift_TBinaryProtocol.py
@@ -266,10 +266,10 @@
def test_TBinaryProtocol_no_strict_write_read(self):
TMessageType = {"T_CALL": 1, "T_REPLY": 2, "T_EXCEPTION": 3, "T_ONEWAY": 4}
test_data = [("short message name", TMessageType['T_CALL'], 0),
- ("1", TMessageType['T_REPLY'], 12345),
- ("loooooooooooooooooooooooooooooooooong", TMessageType['T_EXCEPTION'], 1 << 16),
- ("one way push", TMessageType['T_ONEWAY'], 12),
- ("Janky", TMessageType['T_CALL'], 0)]
+ ("1", TMessageType['T_REPLY'], 12345),
+ ("loooooooooooooooooooooooooooooooooong", TMessageType['T_EXCEPTION'], 1 << 16),
+ ("one way push", TMessageType['T_ONEWAY'], 12),
+ ("Janky", TMessageType['T_CALL'], 0)]
try:
for dt in test_data:
diff --git a/lib/py/test/thrift_TSerializer.py b/lib/py/test/thrift_TSerializer.py
index 600dee7..396e68d 100644
--- a/lib/py/test/thrift_TSerializer.py
+++ b/lib/py/test/thrift_TSerializer.py
@@ -31,7 +31,6 @@
from thrift.protocol.TBinaryProtocol import TBinaryProtocolAcceleratedFactory
from thrift.protocol.TCompactProtocol import TCompactProtocolFactory
from thrift.protocol.TCompactProtocol import TCompactProtocolAcceleratedFactory
-from thrift.transport import TTransport
from thrift.TSerialization import serialize, deserialize
from TestServer.ttypes import Message