gitea-mirror/capa
1
0
Fork 0
mirror of https://github.com/mandiant/capa.git synced 2025-12-12 15:49:46 -08:00
Code Issues Packages Projects Releases Wiki Activity

fix bad merge

Browse Source
This commit is contained in:
William Ballenthin
2021-11-08 14:31:43 -07:00
parent 26b7a0b91d
commit 6c8d246af9
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
capa/features/common.py
View File

@@ -146,13 +146,9 @@ class Feature:
def __repr__(self): def __repr__(self):
return str(self) return str(self)
<<<<<<< HEAD def evaluate(self, ctx: Dict["Feature", Set[int]]) -> Result:
def evaluate(self, ctx: Dict["Feature", Set[int]]) -> "Result":
capa.perf.counters["evaluate.feature"] += 1 capa.perf.counters["evaluate.feature"] += 1
capa.perf.counters["evaluate.feature." + self.name] += 1 capa.perf.counters["evaluate.feature." + self.name] += 1
=======
def evaluate(self, ctx: Dict["Feature", Set[int]]) -> Result:
>>>>>>> master
return Result(self in ctx, self, [], locations=ctx.get(self, [])) return Result(self in ctx, self, [], locations=ctx.get(self, []))
def freeze_serialize(self): def freeze_serialize(self):