From 02cef8297c6fab0856ce0d16f3ad937a84e8434d Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Wed, 25 May 2022 15:27:56 -0600 Subject: [PATCH] pep8 --- capa/features/common.py | 4 ++-- scripts/show-features.py | 18 +++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/capa/features/common.py b/capa/features/common.py index 67d030ac..cd9e95f1 100644 --- a/capa/features/common.py +++ b/capa/features/common.py @@ -140,7 +140,7 @@ class Feature(abc.ABC): return Result(self in ctx, self, [], locations=ctx.get(self, set())) def freeze_serialize(self): - return (self.__class__.__name__, (self.value, )) + return (self.__class__.__name__, (self.value,)) @classmethod def freeze_deserialize(cls, args): @@ -377,7 +377,7 @@ class Bytes(Feature): return hex_string(bytes_to_str(self.value)) def freeze_serialize(self): - return (self.__class__.__name__, (bytes_to_str(self.value).upper(), )) + return (self.__class__.__name__, (bytes_to_str(self.value).upper(),)) @classmethod def freeze_deserialize(cls, args): diff --git a/scripts/show-features.py b/scripts/show-features.py index 51df9567..abeafd0a 100644 --- a/scripts/show-features.py +++ b/scripts/show-features.py @@ -138,9 +138,7 @@ def main(argv=None): # TODO fix function_handles = tuple(filter(lambda fh: fh.address == args.function, function_handles)) else: - function_handles = tuple( - filter(lambda fh: v.format_address(fh.address) == args.function, function_handles) - ) + function_handles = tuple(filter(lambda fh: v.format_address(fh.address) == args.function, function_handles)) if args.function not in [v.format_address(fh.address) for fh in function_handles]: print("%s not a function" % args.function) @@ -188,9 +186,7 @@ def print_features(functions, extractor: capa.features.extractors.base_extractor for f in functions: if extractor.is_library_function(f.address): function_name = extractor.get_function_name(f.address) - logger.debug( - "skipping library function %s (%s)", v.format_address(f.address), function_name - ) + logger.debug("skipping library function %s (%s)", v.format_address(f.address), function_name) continue print("func: %s" % (v.format_address(f.address))) @@ -221,7 +217,15 @@ def print_features(functions, extractor: capa.features.extractors.base_extractor try: if insn.address != addr: - print(" insn: %s: %s: %s -> %s" % (v.format_address(f.address), v.format_address(insn.address), feature, v.format_address(addr))) + print( + " insn: %s: %s: %s -> %s" + % ( + v.format_address(f.address), + v.format_address(insn.address), + feature, + v.format_address(addr), + ) + ) else: print(" insn: %s: %s" % (v.format_address(insn.address), feature))