refactor: update types syntax in test (#2394)

* Changed files

* Update test_util.py

* Update cve_scanner.py

* Changed files

* Update test_extractor.py

* Update test_extractor.py

* Revert "Update test_extractor.py"

This reverts commit b541ece.

* Update test_util.py

* Update test_util.py

* Revert default dict for now

* isort linting

* Update test_util.py

* Reverting all changes to cve_scanner and test_util

* Linting

Co-authored-by: Terri Oda <[email protected]>

Author: metabiswadeep

cve_bin_tool/cve_scanner.py

@@ -60,7 +60,6 @@ def __init__(
 
     def get_cves(self, product_info: ProductInfo, triage_data: TriageData):
         """Get CVEs against a specific version of a product.
-
         Example:
             nvd.get_cves('haxx', 'curl', '7.34.0')
         """

test/test_async_utils.py

@@ -4,10 +4,12 @@
 """
 CVE-bin-tool async util tests
 """
+from __future__ import annotations
+
 import dataclasses
 import subprocess
 import unittest.mock
-from typing import Callable, Coroutine, Tuple
+from collections.abc import Coroutine
 
 import pytest
 
@@ -18,11 +20,11 @@
 class FakeProcess:
     returncode: int
 
-    async def communicate(self) -> Tuple[bytes, bytes]:
+    async def communicate(self) -> tuple[bytes, bytes]:
         return b"", b""
 
 
-def mkexec(returncode: int) -> Callable[..., Coroutine[None, None, FakeProcess]]:
+def mkexec(returncode: int) -> callable[..., Coroutine[None, None, FakeProcess]]:
     async def return_fake_process(*args, **kwargs) -> FakeProcess:
         return FakeProcess(returncode=returncode)
 

test/test_cvescanner.py

@@ -1,5 +1,6 @@
 # Copyright (C) 2021 Anthony Harrison
 # SPDX-License-Identifier: GPL-3.0-or-later
+from __future__ import annotations
 
 import pytest
 

test/test_data/grub2.py

@@ -1,9 +1,9 @@
 # Copyright (C) 2022 Orange
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from typing import Dict, List
+from __future__ import annotations
 
-mapping_test_data: List[Dict] = []
+mapping_test_data: list[dict] = []
 package_test_data = [
     {
         "url": "http://rpmfind.net/linux/opensuse/distribution/leap/15.5/repo/oss/aarch64/",

test/test_data/kerberos.py

@@ -1,7 +1,7 @@
 # Copyright (C) 2021 Intel Corporation
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from typing import Dict, List
+from __future__ import annotations
 
 mapping_test_data = [
     {
@@ -23,4 +23,4 @@
         ],
     },
 ]
-package_test_data: List[Dict] = []
+package_test_data: list[dict] = []

test/test_data/kerberos_5.py

@@ -1,9 +1,9 @@
 # Copyright (C) 2021 Intel Corporation
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from typing import Dict, List
+from __future__ import annotations
 
-mapping_test_data: List[Dict] = []
+mapping_test_data: list[dict] = []
 package_test_data = [
     {
         "url": "http://mirror.centos.org/centos/7/os/x86_64/Packages/",

test/test_data/unbound.py

@@ -1,9 +1,9 @@
 # Copyright (C) 2022 Orange
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from typing import Dict, List
+from __future__ import annotations
 
-mapping_test_data: List[Dict] = []
+mapping_test_data: list[dict] = []
 package_test_data = [
     {
         "url": "http://rpmfind.net/linux/fedora/linux/development/rawhide/Everything/aarch64/os/Packages/u/",

test/test_extractor.py

@@ -2,6 +2,8 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 """ CVE Binary Tool tests for the extractor function """
+from __future__ import annotations
+
 import shutil
 import sys
 import tarfile
@@ -21,7 +23,6 @@
     ZST_FILE_PATH,
     download_file,
 )
-from typing import Dict, List
 from zipfile import ZipFile, ZipInfo
 
 import pytest
@@ -63,12 +64,12 @@ async def extract_files(self, filenames):
                 yield await ectx.aio_extract(str(self.tempdir / filename))
 
     @pytest.fixture
-    def extension_list(self) -> List[str]:
+    def extension_list(self) -> list[str]:
         return []
 
     @pytest.mark.asyncio
     @pytest.mark.skipif(sys.version_info < (3, 8), reason="py3.7 fails sometimes")
-    async def test_bad_files(self, extension_list: List[str]):
+    async def test_bad_files(self, extension_list: list[str]):
         """Test handling of invalid files. No exceptions should be raised."""
         for extension in extension_list:
             filename = self.tempdir / f"empty-file{extension}"
@@ -99,11 +100,11 @@ def setup_method(self):
             tar.close()
 
     @pytest.fixture
-    def extension_list(self) -> List[str]:
+    def extension_list(self) -> list[str]:
         return self.extractor.file_extractors[self.extractor.extract_file_tar]
 
     @pytest.mark.asyncio
-    async def test_extract_file_tar(self, extension_list: List[str]):
+    async def test_extract_file_tar(self, extension_list: list[str]):
         """Test the tar file extraction"""
         async for dir_path in self.extract_files(
             [f"test{extension}" for extension in extension_list]
@@ -129,12 +130,12 @@ def setup_class(cls):
         download_file(CURL_7_20_0_URL, cls.tempdir / "test.rpm")
 
     @pytest.fixture
-    def extension_list(self) -> List[str]:
+    def extension_list(self) -> list[str]:
         return self.extractor.file_extractors[self.extractor.extract_file_rpm]
 
     @pytest.mark.asyncio
     @pytest.mark.skipif(sys.version_info < (3, 8), reason="py3.7 fails sometimes")
-    async def test_extract_file_rpm(self, extension_list: List[str]):
+    async def test_extract_file_rpm(self, extension_list: list[str]):
         """Test the rpm file extraction"""
         async for extracted_path in self.extract_files(
             [f"test{extension}" for extension in extension_list]
@@ -143,7 +144,7 @@ async def test_extract_file_rpm(self, extension_list: List[str]):
 
     @pytest.mark.asyncio
     @pytest.mark.skipif(sys.version_info < (3, 8), reason="py3.7 fails sometimes")
-    async def test_extract_file_rpm_no_rpm2cipo(self, extension_list: List[str]):
+    async def test_extract_file_rpm_no_rpm2cipo(self, extension_list: list[str]):
         """Test rpm extraction using rpmfile"""
         with unittest.mock.patch(
             "cve_bin_tool.async_utils.aio_inpath",
@@ -162,15 +163,15 @@ def setup_method(self):
         shutil.copyfile(ZST_FILE_PATH, self.tempdir / "test.zst")
 
     @pytest.fixture
-    def extension_list(self) -> List[str]:
+    def extension_list(self) -> list[str]:
         return self.extractor.file_extractors[self.extractor.extract_file_zst]
 
     @pytest.mark.asyncio
     @pytest.mark.skipif(sys.version_info < (3, 8), reason="py3.7 fails sometimes")
     @pytest.mark.skipif(
         sys.platform == "win32", reason="windows zst support incomplete"
     )
-    async def test_extract_file_zst(self, extension_list: List[str]):
+    async def test_extract_file_zst(self, extension_list: list[str]):
         """Test the zst file extraction"""
         async for extracted_path in self.extract_files(
             [f"test{extension}" for extension in extension_list]
@@ -188,7 +189,7 @@ def setup_method(self):
         shutil.copyfile(PKG_FILE_PATH, self.tempdir / "test.pkg")
 
     @pytest.fixture
-    def extension_list(self) -> List[str]:
+    def extension_list(self) -> list[str]:
         return self.extractor.file_extractors[self.extractor.extract_file_pkg]
 
     @pytest.mark.parametrize(
@@ -202,8 +203,8 @@ def extension_list(self) -> List[str]:
     @pytest.mark.skipif(sys.version_info < (3, 8), reason="py3.7 fails sometimes")
     async def test_extract_file_pkg(
         self,
-        extension_list: List[str],
-        inpath_return_values: Dict[str, bool],
+        extension_list: list[str],
+        inpath_return_values: dict[str, bool],
         mocker: MockerFixture,
     ):
         """Test the pkg file extraction"""
@@ -234,12 +235,12 @@ def setup_class(cls):
         shutil.copyfile(DOVECOT_FILE_PATH, cls.tempdir / "test.rpm")
 
     @pytest.fixture
-    def extension_list(self) -> List[str]:
+    def extension_list(self) -> list[str]:
         return self.extractor.file_extractors[self.extractor.extract_file_rpm]
 
     @pytest.mark.asyncio
     @pytest.mark.skipif(sys.version_info < (3, 8), reason="py3.7 fails sometimes")
-    async def test_extract_file_rpm(self, extension_list: List[str]):
+    async def test_extract_file_rpm(self, extension_list: list[str]):
         """Test the rpm file extraction in windows with zstd"""
         async for extracted_path in self.extract_files(
             [f"test{extension}" for extension in extension_list]
@@ -256,12 +257,12 @@ def setup_method(self):
         shutil.copyfile(self.tempdir / "test.deb", self.tempdir / "test.ipk")
 
     @pytest.fixture
-    def extension_list(self) -> List[str]:
+    def extension_list(self) -> list[str]:
         return self.extractor.file_extractors[self.extractor.extract_file_deb]
 
     @pytest.mark.asyncio
     @pytest.mark.skipif(sys.version_info < (3, 8), reason="py3.7 fails sometimes")
-    async def test_extract_file_deb(self, extension_list: List[str]):
+    async def test_extract_file_deb(self, extension_list: list[str]):
         """Test the deb file extraction"""
         async for extracted_path in self.extract_files(
             [f"test{extension}" for extension in extension_list]
@@ -272,7 +273,7 @@ async def test_extract_file_deb(self, extension_list: List[str]):
 
     @pytest.mark.asyncio
     async def test_extract_file_deb_no_tool(
-        self, extension_list: List[str], mocker: MockerFixture
+        self, extension_list: list[str], mocker: MockerFixture
     ):
         """Test the deb file extraction with no extraction tool"""
 
@@ -303,12 +304,12 @@ def setup_method(self):
         shutil.copyfile(IPK_FILE_PATH, self.tempdir / "test.ipk")
 
     @pytest.fixture
-    def extension_list(self) -> List[str]:
+    def extension_list(self) -> list[str]:
         return self.extractor.file_extractors[self.extractor.extract_file_deb]
 
     @pytest.mark.asyncio
     @pytest.mark.skipif(sys.version_info < (3, 8), reason="py3.7 fails sometimes")
-    async def test_extract_file_ipk(self, extension_list: List[str]):
+    async def test_extract_file_ipk(self, extension_list: list[str]):
         """Test the ipk file extraction"""
         async for extracted_path in self.extract_files(
             [f"test{extension}" for extension in extension_list]
@@ -325,12 +326,12 @@ def setup_method(self):
         shutil.copyfile(CAB_TEST_FILE_PATH, self.tempdir / "test.cab")
 
     @pytest.fixture
-    def extension_list(self) -> List[str]:
+    def extension_list(self) -> list[str]:
         return self.extractor.file_extractors[self.extractor.extract_file_cab]
 
     @pytest.mark.asyncio
     @pytest.mark.skipif(sys.version_info < (3, 8), reason="py3.7 fails sometimes")
-    async def test_extract_file_cab(self, extension_list: List[str]):
+    async def test_extract_file_cab(self, extension_list: list[str]):
         """Test the cab file extraction"""
         async for extracted_path in self.extract_files(
             [f"test{extension}" for extension in extension_list]
@@ -339,7 +340,7 @@ async def test_extract_file_cab(self, extension_list: List[str]):
 
     @pytest.mark.asyncio
     async def test_extract_file_cab_no_cabextract(
-        self, extension_list: List[str], mocker: MockerFixture
+        self, extension_list: list[str], mocker: MockerFixture
     ):
         """Test the cab file extraction with no extraction tool"""
 
@@ -365,14 +366,14 @@ class TestExtractFileZip(TestExtractorBase):
     when the exe is a self-extracting zipfile"""
 
     @pytest.fixture
-    def extension_list(self) -> List[str]:
+    def extension_list(self) -> list[str]:
         return list(
             self.extractor.file_extractors[self.extractor.extract_file_apk]
             | self.extractor.file_extractors[self.extractor.extract_file_zip]
         )
 
     @pytest.fixture(autouse=True)
-    def setup_method(self, extension_list: List[str]):
+    def setup_method(self, extension_list: list[str]):
         for filename in [f"test{extension}" for extension in extension_list]:
             zippath = self.tempdir / filename
             with ZipFile(zippath, "w") as zipfile:
@@ -391,8 +392,8 @@ def setup_method(self, extension_list: List[str]):
     @pytest.mark.skipif(sys.version_info < (3, 8), reason="py3.7 fails sometimes")
     async def test_extract_file_zip(
         self,
-        extension_list: List[str],
-        inpath_return_values: Dict[str, bool],
+        extension_list: list[str],
+        inpath_return_values: dict[str, bool],
         mocker: MockerFixture,
     ):
         """Test the zip file extraction"""

test/test_format_checker.py

@@ -4,9 +4,10 @@
 """
 CVE-bin-tool Format Checker tests
 """
+from __future__ import annotations
+
 import re
 from pathlib import Path
-from typing import List
 
 import pytest
 from pytest_mock import MockerFixture
@@ -68,13 +69,13 @@ def checkers_array(self):
         return checkers_array
 
     @pytest.fixture
-    def shape_list(self, checkers_array: List[List[str]]):
+    def shape_list(self, checkers_array: list[list[str]]):
         shape_list = format_checkers.max_checker_length(checkers_array)
         assert shape_list == [15, 7, 16, 7, 7, 13, 15]
         return shape_list
 
     @pytest.fixture
-    def checkers_markdown(self, checkers_array: List[List[str]], shape_list: List[int]):
+    def checkers_markdown(self, checkers_array: list[list[str]], shape_list: list[int]):
         checkers_markdown = format_checkers.reformat_checkers(
             checkers_array, shape_list
         )

test/test_sbom.py

@@ -1,8 +1,8 @@
 # Copyright (C) 2021 Anthony Harrison
 # SPDX-License-Identifier: GPL-3.0-or-later
+from __future__ import annotations
 
 from pathlib import Path
-from typing import Dict
 
 import pytest
 
@@ -70,7 +70,7 @@ def test_invalid_type(self, filename: str, sbom_type: str):
         ),
     )
     def test_valid_spdx_file(
-        self, filename: str, spdx_parsed_data: Dict[ProductInfo, TriageData]
+        self, filename: str, spdx_parsed_data: dict[ProductInfo, TriageData]
     ):
         sbom_engine = SBOMManager(filename, sbom_type="spdx")
         assert sbom_engine.scan_file() == spdx_parsed_data
@@ -84,7 +84,7 @@ def test_valid_spdx_file(
         ),
     )
     def test_valid_cyclonedx_file(
-        self, filename: str, cyclonedx_parsed_data: Dict[ProductInfo, TriageData]
+        self, filename: str, cyclonedx_parsed_data: dict[ProductInfo, TriageData]
     ):
         sbom_engine = SBOMManager(filename, sbom_type="cyclonedx")
         assert sbom_engine.scan_file() == cyclonedx_parsed_data
@@ -94,7 +94,7 @@ def test_valid_cyclonedx_file(
         ((str(SBOM_PATH / "swid_test.xml"), PARSED_SBOM_DATA),),
     )
     def test_valid_swid_file(
-        self, filename: str, swid_parsed_data: Dict[ProductInfo, TriageData]
+        self, filename: str, swid_parsed_data: dict[ProductInfo, TriageData]
     ):
         sbom_engine = SBOMManager(filename, sbom_type="swid")
         assert sbom_engine.scan_file() == swid_parsed_data