diff --git a/capa/ida/ida_capa_explorer.py b/capa/ida/ida_capa_explorer.py index 06f23b8b..f42c0978 100644 --- a/capa/ida/ida_capa_explorer.py +++ b/capa/ida/ida_capa_explorer.py @@ -376,7 +376,7 @@ class CapaExplorerForm(idaapi.PluginForm): "analysis": { # "format" is difficult to determine via IDAPython "extractor": "ida", - } + }, } doc = capa.render.convert_capabilities_to_result_document(meta, rules, capabilities) diff --git a/capa/main.py b/capa/main.py index 4d5850e6..9d3d96e0 100644 --- a/capa/main.py +++ b/capa/main.py @@ -327,7 +327,7 @@ def collect_metadata(argv, path, format, extractor): sha1 = hashlib.sha1() sha256 = hashlib.sha256() - with open(path, 'rb') as f: + with open(path, "rb") as f: buf = f.read() md5.update(buf) @@ -343,10 +343,7 @@ def collect_metadata(argv, path, format, extractor): "sha256": sha256.hexdigest(), "path": os.path.normpath(path), }, - "analysis": { - "format": format, - "extractor": extractor.__class__.__name__, - }, + "analysis": {"format": format, "extractor": extractor.__class__.__name__,}, } diff --git a/capa/render/__init__.py b/capa/render/__init__.py index a9ba1784..5b625217 100644 --- a/capa/render/__init__.py +++ b/capa/render/__init__.py @@ -258,6 +258,7 @@ def render_default(meta, rules, capabilities): class CapaJsonObjectEncoder(json.JSONEncoder): """JSON encoder that emits Python sets as sorted lists""" + def default(self, obj): if isinstance(obj, (list, dict, int, float, bool, type(None))) or isinstance(obj, six.string_types): return json.JSONEncoder.default(self, obj)