diff --git a/capa/capabilities/static.py b/capa/capabilities/static.py index 85ca0dd2..6c09f1ed 100644 --- a/capa/capabilities/static.py +++ b/capa/capabilities/static.py @@ -19,6 +19,7 @@ import collections from dataclasses import dataclass import capa.perf +import capa.engine import capa.helpers import capa.features.freeze as frz import capa.render.result_document as rdoc diff --git a/capa/features/extractors/cape/extractor.py b/capa/features/extractors/cape/extractor.py index ca8c062c..03d8fe73 100644 --- a/capa/features/extractors/cape/extractor.py +++ b/capa/features/extractors/cape/extractor.py @@ -16,6 +16,7 @@ import logging from typing import Union, Iterator +import capa.helpers import capa.features.extractors.cape.call import capa.features.extractors.cape.file import capa.features.extractors.cape.thread diff --git a/capa/render/utils.py b/capa/render/utils.py index e61b6961..7358b662 100644 --- a/capa/render/utils.py +++ b/capa/render/utils.py @@ -17,8 +17,8 @@ import io from typing import Union, Iterator, Optional import rich.console +from rich.text import Text from rich.markup import escape -from rich.progress import Text import capa.render.result_document as rd diff --git a/capa/render/verbose.py b/capa/render/verbose.py index a872755e..8362b091 100644 --- a/capa/render/verbose.py +++ b/capa/render/verbose.py @@ -38,6 +38,7 @@ import capa.rules import capa.helpers import capa.render.utils as rutils import capa.features.freeze as frz +import capa.features.address import capa.render.result_document as rd from capa.rules import RuleSet from capa.engine import MatchResults diff --git a/capa/rules/cache.py b/capa/rules/cache.py index f23e6121..2239e9a0 100644 --- a/capa/rules/cache.py +++ b/capa/rules/cache.py @@ -180,9 +180,9 @@ def generate_rule_cache(rules_dir: Path, cache_dir: Path) -> bool: logger.error("%s", str(e)) return False - content = capa.rules.cache.get_ruleset_content(rules) - id = capa.rules.cache.compute_cache_identifier(content) - path = capa.rules.cache.get_cache_path(cache_dir, id) + content = get_ruleset_content(rules) + id = compute_cache_identifier(content) + path = get_cache_path(cache_dir, id) assert path.exists() logger.info("rules cache saved to: %s", path) diff --git a/tests/test_capabilities.py b/tests/test_capabilities.py index b965b06f..824b821e 100644 --- a/tests/test_capabilities.py +++ b/tests/test_capabilities.py @@ -14,6 +14,7 @@ import textwrap +import capa.rules import capa.capabilities.common from capa.features.extractors.base_extractor import FunctionFilter diff --git a/tests/test_result_document.py b/tests/test_result_document.py index 7775c033..10a33981 100644 --- a/tests/test_result_document.py +++ b/tests/test_result_document.py @@ -18,7 +18,12 @@ import pytest import fixtures import capa +import capa.rules import capa.engine as ceng +import capa.features.file +import capa.features.insn +import capa.features.common +import capa.features.basicblock import capa.render.result_document as rdoc import capa.features.freeze.features as frzf from capa.capabilities.common import Capabilities