Style , mypy checks

capa/render/proto/__init__.py

@@ -29,6 +29,7 @@ import json
 import argparse
 import datetime
 from typing import Any, Dict, Union
+from pathlib import Path
 
 import google.protobuf.json_format
 from google.protobuf.json_format import MessageToJson
@@ -500,7 +501,7 @@ def metadata_from_pb2(meta: capa_pb2.Metadata) -> rd.Metadata:
             arch=meta.analysis.arch,
             os=meta.analysis.os,
             extractor=meta.analysis.extractor,
-            rules=tuple(meta.analysis.rules),
+            rules=tuple(Path(r) for r in meta.analysis.rules),
             base_address=addr_from_pb2(meta.analysis.base_address),
             layout=rd.Layout(
                 functions=tuple(

capa/rules/cache.py

@@ -1,3 +1,4 @@
+import os
 import sys
 import zlib
 import pickle

scripts/cache-ruleset.py

@@ -20,6 +20,7 @@ import sys
 import time
 import logging
 import argparse
+from pathlib import Path
 
 import capa.main
 import capa.rules
@@ -48,8 +49,9 @@ def main(argv=None):
         logging.getLogger("capa").setLevel(logging.ERROR)
 
     try:
-        os.makedirs(args.cache, exist_ok=True)
-        rules = capa.main.get_rules(args.rules, cache_dir=args.cache)
+        cache_dir = Path(args.cache)
+        cache_dir.mkdir(parents=True, exist_ok=True)
+        rules = capa.main.get_rules(args.rules, cache_dir)
         logger.info("successfully loaded %s rules", len(rules))
     except (IOError, capa.rules.InvalidRule, capa.rules.InvalidRuleSet) as e:
         logger.error("%s", str(e))