mirror of
https://github.com/mandiant/capa.git
synced 2026-04-28 11:53:20 -07:00
fix: revert disable_progress to bool=False, drop Optional[bool]=None workaround
This commit is contained in:
committed by
Willi Ballenthin
parent
295ae3ee4b
commit
fe4fece1bc
@@ -65,7 +65,7 @@ class Capabilities:
|
||||
|
||||
|
||||
def find_capabilities(
|
||||
ruleset: RuleSet, extractor: FeatureExtractor, disable_progress: Optional[bool] = None, **kwargs
|
||||
ruleset: RuleSet, extractor: FeatureExtractor, disable_progress: bool = False, **kwargs
|
||||
) -> Capabilities:
|
||||
from capa.capabilities.static import find_static_capabilities
|
||||
from capa.capabilities.dynamic import find_dynamic_capabilities
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
import logging
|
||||
import itertools
|
||||
import collections
|
||||
from typing import Optional
|
||||
from dataclasses import dataclass
|
||||
|
||||
import capa.perf
|
||||
@@ -270,7 +269,7 @@ def find_process_capabilities(
|
||||
|
||||
|
||||
def find_dynamic_capabilities(
|
||||
ruleset: RuleSet, extractor: DynamicFeatureExtractor, disable_progress: Optional[bool] = None
|
||||
ruleset: RuleSet, extractor: DynamicFeatureExtractor, disable_progress: bool = False
|
||||
) -> Capabilities:
|
||||
all_process_matches: MatchResults = collections.defaultdict(list)
|
||||
all_thread_matches: MatchResults = collections.defaultdict(list)
|
||||
@@ -286,7 +285,7 @@ def find_dynamic_capabilities(
|
||||
n_processes: int = len(processes)
|
||||
|
||||
with capa.helpers.CapaProgressBar(
|
||||
console=capa.helpers.log_console, transient=True, disable=bool(disable_progress)
|
||||
console=capa.helpers.log_console, transient=True, disable=disable_progress
|
||||
) as pbar:
|
||||
task = pbar.add_task("matching", total=n_processes, unit="processes")
|
||||
for p in processes:
|
||||
|
||||
@@ -16,7 +16,6 @@ import time
|
||||
import logging
|
||||
import itertools
|
||||
import collections
|
||||
from typing import Optional
|
||||
from dataclasses import dataclass
|
||||
|
||||
import capa.perf
|
||||
@@ -150,7 +149,7 @@ def find_code_capabilities(ruleset: RuleSet, extractor: StaticFeatureExtractor,
|
||||
|
||||
|
||||
def find_static_capabilities(
|
||||
ruleset: RuleSet, extractor: StaticFeatureExtractor, disable_progress: Optional[bool] = None
|
||||
ruleset: RuleSet, extractor: StaticFeatureExtractor, disable_progress: bool = False
|
||||
) -> Capabilities:
|
||||
all_function_matches: MatchResults = collections.defaultdict(list)
|
||||
all_bb_matches: MatchResults = collections.defaultdict(list)
|
||||
@@ -169,7 +168,7 @@ def find_static_capabilities(
|
||||
percentage: float = 0
|
||||
|
||||
with capa.helpers.CapaProgressBar(
|
||||
console=capa.helpers.log_console, transient=True, disable=bool(disable_progress)
|
||||
console=capa.helpers.log_console, transient=True, disable=disable_progress
|
||||
) as pbar:
|
||||
task = pbar.add_task(
|
||||
"matching", total=n_funcs, unit="functions", postfix=f"skipped {n_libs} library functions, {percentage}%"
|
||||
|
||||
Reference in New Issue
Block a user