From 2b00bc0fdb0026417abd5f6c65e128d074c3be4e Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Fri, 8 Apr 2022 12:46:43 -0600 Subject: [PATCH] pep8 --- capa/features/address.py | 2 +- capa/features/extractors/pefile.py | 2 +- capa/features/extractors/viv/insn.py | 4 +++- capa/render/verbose.py | 10 +++++++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/capa/features/address.py b/capa/features/address.py index e26d0196..aaa3c56d 100644 --- a/capa/features/address.py +++ b/capa/features/address.py @@ -54,7 +54,7 @@ class DNTokenOffsetAddress(Address): def __init__(self, token: Token, offset: int): assert offset >= 0 self.token = token - self.rva = offset + self.offset = offset class _NoAddress(Address): diff --git a/capa/features/extractors/pefile.py b/capa/features/extractors/pefile.py index 0e52785b..e6449096 100644 --- a/capa/features/extractors/pefile.py +++ b/capa/features/extractors/pefile.py @@ -17,8 +17,8 @@ import capa.features.extractors.helpers import capa.features.extractors.strings from capa.features.file import Export, Import, Section from capa.features.common import OS, ARCH_I386, FORMAT_PE, ARCH_AMD64, OS_WINDOWS, Arch, Format, Characteristic +from capa.features.address import NO_ADDRESS, FileOffsetAddress, AbsoluteVirtualAddress from capa.features.extractors.base_extractor import FeatureExtractor -from capa.features.address import NO_ADDRESS, AbsoluteVirtualAddress, FileOffsetAddress logger = logging.getLogger(__name__) diff --git a/capa/features/extractors/viv/insn.py b/capa/features/extractors/viv/insn.py index f0cf5b4b..8d81ddb2 100644 --- a/capa/features/extractors/viv/insn.py +++ b/capa/features/extractors/viv/insn.py @@ -589,7 +589,9 @@ def extract_op_number_features( yield OperandOffset(i, v), ihandle.address -def extract_op_offset_features(fhandle: FunctionHandle, bb, ihandle: InsnHandle, i, oper: envi.Operand) -> Iterator[Tuple[Feature, Address]]: +def extract_op_offset_features( + fhandle: FunctionHandle, bb, ihandle: InsnHandle, i, oper: envi.Operand +) -> Iterator[Tuple[Feature, Address]]: """parse structure offset features from the given operand.""" # example: # diff --git a/capa/render/verbose.py b/capa/render/verbose.py index abfdaa15..5a953781 100644 --- a/capa/render/verbose.py +++ b/capa/render/verbose.py @@ -29,7 +29,15 @@ import capa.render.utils as rutils import capa.render.result_document from capa.rules import RuleSet from capa.engine import MatchResults -from capa.features.address import Address, AbsoluteVirtualAddress, DNTokenAddress, FileOffsetAddress, NO_ADDRESS, RelativeVirtualAddress, DNTokenOffsetAddress +from capa.features.address import ( + NO_ADDRESS, + Address, + DNTokenAddress, + FileOffsetAddress, + DNTokenOffsetAddress, + AbsoluteVirtualAddress, + RelativeVirtualAddress, +) def format_address(address: Address) -> str: