Merged Changes from PR #1591

capa/features/extractors/dotnetfile.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Tuple, Iterator, cast
+from typing import Tuple, Iterator
 from pathlib import Path
 
 import dnfile

capa/helpers.py

@@ -5,7 +5,6 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the License
 #  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
-import os
 import inspect
 import logging
 import contextlib

capa/ida/plugin/form.py

@@ -5,7 +5,6 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the License
 #  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
-import os
 import copy
 import logging
 import itertools

capa/main.py

@@ -576,7 +576,7 @@ def get_extractor(
         return capa.features.extractors.viv.extractor.VivisectFeatureExtractor(vw, path, os_)
 
 
-def get_file_extractors(sample: str, format_: str) -> List[FeatureExtractor]:
+def get_file_extractors(sample: Path, format_: str) -> List[FeatureExtractor]:
     file_extractors: List[FeatureExtractor] = list()
 
     if format_ == FORMAT_PE:

scripts/cache-ruleset.py

@@ -15,7 +15,6 @@ Unless required by applicable law or agreed to in writing, software distributed
  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and limitations under the License.
 """
-import os
 import sys
 import logging
 import argparse

scripts/capa_as_library.py

@@ -2,7 +2,7 @@
 
 import json
 import collections
-from typing import Any, Dict
+from typing import Any, Set, Dict
 from pathlib import Path
 
 import capa.main

scripts/lint.py

@@ -23,7 +23,6 @@ import string
 import difflib
 import hashlib
 import logging
-import pathlib
 import argparse
 import itertools
 import posixpath

tests/fixtures.py

@@ -7,7 +7,6 @@
 #  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
 
-import os
 import binascii
 import contextlib
 import collections

tests/test_rule_cache.py

@@ -6,7 +6,6 @@
 #  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
 
-import os
 import textwrap
 
 import capa.rules

tests/test_scripts.py

@@ -6,7 +6,6 @@
 #  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
 
-import os
 import sys
 import logging
 import textwrap