pep8 + mypy

capa/features/common.py

@@ -92,7 +92,7 @@ class Result:
 
 
 class Feature(abc.ABC):
-    def __init__(self, value: Union[str, int, bytes], description=None):
+    def __init__(self, value: Union[str, int, float, bytes], description=None):
         """
         Args:
           value (any): the value of the feature, such as the number or string.

capa/features/extractors/common.py

@@ -16,7 +16,7 @@ from capa.features.address import NO_ADDRESS, Address, FileOffsetAddress
 logger = logging.getLogger(__name__)
 
 
-def extract_file_strings(buf, **kwargs) -> Iterator[Tuple[Feature, Address]]:
+def extract_file_strings(buf, **kwargs) -> Iterator[Tuple[String, Address]]:
     """
     extract ASCII and UTF-16 LE strings from file
     """

capa/features/extractors/dnfile/file.py

@@ -18,6 +18,7 @@ if TYPE_CHECKING:
 
 import capa.features.extractors
 
+
 def extract_file_import_names(pe: dnfile.dnPE) -> Iterator[Tuple[Import, Address]]:
     yield from capa.features.extractors.dotnetfile.extract_file_import_names(pe=pe)
 
@@ -25,7 +26,7 @@ def extract_file_import_names(pe: dnfile.dnPE) -> Iterator[Tuple[Import, Address
 def extract_file_format(pe: dnfile.dnPE) -> Iterator[Tuple[Format, Address]]:
     yield from capa.features.extractors.dotnetfile.extract_file_format(pe=pe)
 
-    
+
 def extract_file_function_names(pe: dnfile.dnPE) -> Iterator[Tuple[FunctionName, Address]]:
     yield from capa.features.extractors.dotnetfile.extract_file_function_names(pe=pe)
 

capa/features/extractors/dotnetfile.py

@@ -6,9 +6,6 @@ import pefile
 from dncil.clr.token import Token
 
 import capa.features.extractors.helpers
-from capa.features.file import Import
-from capa.features.common import OS, OS_ANY, ARCH_ANY, ARCH_I386, ARCH_AMD64, FORMAT_DOTNET, Arch, Format, Feature
-from capa.features.address import NO_ADDRESS, Address, DNTokenAddress, DNTokenOffsetAddress, AbsoluteVirtualAddress
 from capa.features.file import Import, FunctionName
 from capa.features.common import (
     OS,
@@ -23,6 +20,7 @@ from capa.features.common import (
     Feature,
     Characteristic,
 )
+from capa.features.address import NO_ADDRESS, Address, DNTokenAddress, DNTokenOffsetAddress, AbsoluteVirtualAddress
 from capa.features.extractors.base_extractor import FeatureExtractor
 from capa.features.extractors.dnfile.helpers import (
     is_dotnet_mixed_mode,
@@ -53,7 +51,7 @@ def extract_file_import_names(pe: dnfile.dnPE, **kwargs) -> Iterator[Tuple[Impor
 
 def extract_file_function_names(pe: dnfile.dnPE, **kwargs) -> Iterator[Tuple[FunctionName, Address]]:
     for (token, name) in get_dotnet_managed_method_names(pe):
-        yield FunctionName(name), token
+        yield FunctionName(name), DNTokenAddress(Token(token))
 
 
 def extract_file_os(**kwargs) -> Iterator[Tuple[OS, Address]]:
@@ -77,7 +75,7 @@ def extract_file_strings(pe: dnfile.dnPE, **kwargs) -> Iterator[Tuple[String, Ad
 
 def extract_mixed_mode_characteristic_features(pe: dnfile.dnPE, **kwargs) -> Iterator[Tuple[Characteristic, Address]]:
     if is_dotnet_mixed_mode(pe):
-        yield Characteristic("mixed mode"), 0x0
+        yield Characteristic("mixed mode"), NO_ADDRESS
 
 
 def extract_file_features(pe: dnfile.dnPE) -> Iterator[Tuple[Feature, Address]]:

capa/render/verbose.py

@@ -23,7 +23,6 @@ Unless required by applicable law or agreed to in writing, software distributed
 See the License for the specific language governing permissions and limitations under the License.
 """
 import tabulate
-
 import dnfile.mdtable
 
 import capa.rules