Fixed Python flake8 offenses

Author: kpumuk

lib/py/src/TTornado.py

@@ -66,6 +66,7 @@ def _lock_context(self):
 
 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 @@ def with_timeout(self, timeout, future):
         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):

lib/py/src/protocol/TJSONProtocol.py

@@ -21,7 +21,6 @@
                         TProtocolFactory, checkIntegerLimits)
 import base64
 import math
-import sys
 
 
 __all__ = ['TJSONProtocol',

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
 
 

lib/py/src/transport/THttpClient.py

@@ -102,7 +102,7 @@ def basic_proxy_auth_header(proxy):
         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

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 @@ def __init__(self, host=None, port=9090, *args, **kwargs):
             # 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)

lib/py/src/transport/sslcompat.py

@@ -97,7 +97,8 @@ def _optional_dependencies():
         # 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

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 @@ def setup_thrift_imports():
         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 @@ def TestOneInput(data):
         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 @@ def TestOneInput(data):
         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 @@ def TestOneInput(data):
             # 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_fuzzer(fuzzer_function):
 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_roundtrip_fuzzer(protocol_factory_class):
 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))
+    _run_fuzzer(create_parser_fuzzer(protocol_factory_class))

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()

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() 
+    main()

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() 
+    main()