style: upgrade python code style

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

cyclonedx/_internal/compare.py

@@ -64,7 +64,7 @@ class ComparableDict(ComparableTuple):
     """
 
     def __new__(cls, d: dict[Any, Any]) -> 'ComparableDict':
-        return super(ComparableDict, cls).__new__(cls, sorted(d.items()))
+        return super().__new__(cls, sorted(d.items()))
 
 
 class ComparablePackageURL(ComparableTuple):
@@ -73,7 +73,7 @@ class ComparablePackageURL(ComparableTuple):
     """
 
     def __new__(cls, p: 'PackageURL') -> 'ComparablePackageURL':
-        return super(ComparablePackageURL, cls).__new__(cls, (
+        return super().__new__(cls, (
             p.type,
             p.namespace,
             p.version,

cyclonedx/spdx.py

@@ -39,7 +39,7 @@
     __IDS: set[str] = set(json_load(schema).get('enum', []))
 assert len(__IDS) > 0, 'known SPDX-IDs should be non-empty set'
 
-__IDS_LOWER_MAP: dict[str, str] = dict((id_.lower(), id_) for id_ in __IDS)
+__IDS_LOWER_MAP: dict[str, str] = {id_.lower(): id_ for id_ in __IDS}
 
 __SPDX_EXPRESSION_LICENSING: 'Licensing' = get_spdx_licensing()
 

cyclonedx/validation/__init__.py

@@ -111,7 +111,7 @@ def make_schemabased_validator(output_format: OutputFormat, schema_version: 'Sch
     """
     if TYPE_CHECKING:  # pragma: no cover
         from typing import Type
-        Validator: Type[BaseSchemabasedValidator]  # noqa:N806
+        Validator: type[BaseSchemabasedValidator]  # noqa:N806
     if OutputFormat.JSON is output_format:
         from .json import JsonValidator as Validator
     elif OutputFormat.XML is output_format:

tests/__init__.py

@@ -58,7 +58,7 @@ def writeSnapshot(cls, snapshot_name: str, data: str) -> None:  # noqa: N802
 
     @classmethod
     def readSnapshot(cls, snapshot_name: str) -> str:  # noqa: N802
-        with open(cls.getSnapshotFile(snapshot_name), 'r') as s:
+        with open(cls.getSnapshotFile(snapshot_name)) as s:
             return s.read()
 
     def assertEqualSnapshot(self: Union[TestCase, 'SnapshotMixin'],  # noqa: N802

tests/test_deserialize_xml.py

@@ -42,7 +42,7 @@ def test_prepared(self, get_bom: Callable[[], Bom], *_: Any, **__: Any) -> None:
         # only latest schema will have all data populated in serialized form
         snapshot_name = mksname(get_bom, SchemaVersion.V1_6, OutputFormat.XML)
         expected = get_bom()
-        with open(self.getSnapshotFile(snapshot_name), 'r') as s:
+        with open(self.getSnapshotFile(snapshot_name)) as s:
             bom = Bom.from_xml(s)
         self.assertBomDeepEqual(expected, bom,
                                 fuzzy_deps=get_bom in all_get_bom_funct_with_incomplete_deps)

tests/test_enums.py

@@ -103,8 +103,7 @@ def dp_cases_from_json_schema(sf: str, jsonpointer: Iterable[str]) -> Generator[
             data = data[pp]
     except KeyError:
         return
-    for value in data['enum']:
-        yield value
+    yield from data['enum']
 
 
 def dp_cases_from_json_schemas(*jsonpointer: str) -> Generator[str, None, None]:

tests/test_validation_json.py

@@ -18,7 +18,7 @@
 from glob import iglob
 from itertools import chain
 from os.path import join
-from typing import Generator
+from collections.abc import Generator
 from unittest import TestCase
 
 from ddt import data, ddt, idata, unpack
@@ -69,7 +69,7 @@ def test_throws_with_unsupported_schema_version(self, schema_version: SchemaVers
     @unpack
     def test_validate_no_none(self, schema_version: SchemaVersion, test_data_file: str) -> None:
         validator = JsonValidator(schema_version)
-        with open(join(test_data_file), 'r') as tdfh:
+        with open(join(test_data_file)) as tdfh:
             test_data = tdfh.read()
         try:
             validation_error = validator.validate_str(test_data)
@@ -84,7 +84,7 @@ def test_validate_no_none(self, schema_version: SchemaVersion, test_data_file: s
     @unpack
     def test_validate_expected_error(self, schema_version: SchemaVersion, test_data_file: str) -> None:
         validator = JsonValidator(schema_version)
-        with open(join(test_data_file), 'r') as tdfh:
+        with open(join(test_data_file)) as tdfh:
             test_data = tdfh.read()
         try:
             validation_error = validator.validate_str(test_data)
@@ -109,7 +109,7 @@ def test_throws_with_unsupported_schema_version(self, schema_version: SchemaVers
     @unpack
     def test_validate_no_none(self, schema_version: SchemaVersion, test_data_file: str) -> None:
         validator = JsonStrictValidator(schema_version)
-        with open(join(test_data_file), 'r') as tdfh:
+        with open(join(test_data_file)) as tdfh:
             test_data = tdfh.read()
         try:
             validation_error = validator.validate_str(test_data)
@@ -124,7 +124,7 @@ def test_validate_no_none(self, schema_version: SchemaVersion, test_data_file: s
     @unpack
     def test_validate_expected_error(self, schema_version: SchemaVersion, test_data_file: str) -> None:
         validator = JsonStrictValidator(schema_version)
-        with open(join(test_data_file), 'r') as tdfh:
+        with open(join(test_data_file)) as tdfh:
             test_data = tdfh.read()
         try:
             validation_error = validator.validate_str(test_data)

tests/test_validation_xml.py

@@ -69,7 +69,7 @@ def test_throws_with_unsupported_schema_version(self, schema_version: SchemaVers
     @unpack
     def test_validate_no_none(self, schema_version: SchemaVersion, test_data_file: str) -> None:
         validator = XmlValidator(schema_version)
-        with open(join(test_data_file), 'r') as tdfh:
+        with open(join(test_data_file)) as tdfh:
             test_data = tdfh.read()
         try:
             validation_error = validator.validate_str(test_data)
@@ -84,7 +84,7 @@ def test_validate_no_none(self, schema_version: SchemaVersion, test_data_file: s
     @unpack
     def test_validate_expected_error(self, schema_version: SchemaVersion, test_data_file: str) -> None:
         validator = XmlValidator(schema_version)
-        with open(join(test_data_file), 'r') as tdfh:
+        with open(join(test_data_file)) as tdfh:
             test_data = tdfh.read()
         try:
             validation_error = validator.validate_str(test_data)

tools/schema-downloader.py

@@ -102,7 +102,7 @@
         target = dspec['targetPattern'].replace('%s', version)
         tempfile, _ = urlretrieve(source)  # nosec B310
         print(source, '->', target)
-        with open(tempfile, 'r') as tmpf:
+        with open(tempfile) as tmpf:
             text = tmpf.read()
         with open(target, 'w', newline='\n') as tarf:
             for search, replace in dspec['replace']:

typings/sortedcontainers.pyi

@@ -4,7 +4,8 @@
 #  https://github.com/althonos/python-sortedcontainers/blob/d0a225d7fd0fb4c54532b8798af3cbeebf97e2d5/sortedcontainers/sortedset.pyi
 
 from collections.abc import Callable, Iterable, MutableSet, Sequence
-from typing import Any, Hashable, Optional, TypeVar, Union, overload  # Iterator,; Tuple,; Type, Set
+from typing import Any, Optional, TypeVar, Union, overload  # Iterator,; Tuple,; Type, Set
+from collections.abc import Hashable
 
 # --- Global