chore: PEP8 corrections and others

Author: jkugler

cyclonedx/model/__init__.py

@@ -22,6 +22,25 @@
 from a `cyclonedx.parser.BaseParser` implementation.
 """
 
+from ..exception.model import InvalidLocaleTypeException, InvalidUriException
+from ..serialization import VERSIONS_1_1_AND_LATER
+from .bom_ref import BomRef
+from ..serialization import (
+    ALL_VERSIONS,
+    METADATA_KEY_JSON_NAME,
+    METADATA_KEY_VERSIONS,
+    METADATA_KEY_XML_ATTR,
+    METADATA_KEY_XML_NAME,
+    METADATA_KEY_XML_SEQUENCE,
+    VERSIONS_1_2_AND_LATER,
+    VERSIONS_1_3_AND_LATER,
+    VERSIONS_1_4_AND_LATER,
+    VERSIONS_1_5_AND_LATER,
+    VERSIONS_1_6_AND_LATER,
+    VERSIONS_1_7_AND_LATER,
+)
+from ..schema import SchemaVersion
+from ..exception.serialization import CycloneDxDeserializationException, SerializationOfUnexpectedValueException
 import re
 import sys
 from collections.abc import Iterable
@@ -53,24 +72,7 @@ def _sortedset_converter(value: Any) -> SortedSet:
     if isinstance(value, Iterable) and not isinstance(value, (str, bytes, dict)):
         return SortedSet(value)
     return SortedSet([value])
-from ..exception.model import InvalidLocaleTypeException, InvalidUriException
-from ..exception.serialization import CycloneDxDeserializationException, SerializationOfUnexpectedValueException
-from ..schema import SchemaVersion
-from ..serialization import (
-    ALL_VERSIONS,
-    METADATA_KEY_JSON_NAME,
-    METADATA_KEY_VERSIONS,
-    METADATA_KEY_XML_ATTR,
-    METADATA_KEY_XML_NAME,
-    METADATA_KEY_XML_SEQUENCE,
-    VERSIONS_1_2_AND_LATER,
-    VERSIONS_1_3_AND_LATER,
-    VERSIONS_1_4_AND_LATER,
-    VERSIONS_1_5_AND_LATER,
-    VERSIONS_1_6_AND_LATER,
-    VERSIONS_1_7_AND_LATER,
-)
-from .bom_ref import BomRef
+
 
 _BOM_LINK_PREFIX = 'urn:cdx:'
 
@@ -322,7 +324,6 @@ class ExternalReferenceType(str, Enum):
 
 
 # External reference type support by schema version
-from ..serialization import VERSIONS_1_1_AND_LATER
 
 EXTREF_TYPE_VERSIONS: dict[ExternalReferenceType, set[SchemaVersion]] = {
     ExternalReferenceType.VCS: VERSIONS_1_1_AND_LATER,

cyclonedx/model/bom.py

@@ -621,6 +621,7 @@ def from_json(cls, data: Union[dict, str, bytes]) -> 'Bom':
             A new Bom instance
         """
         import json
+
         from ..serialization import make_converter
 
         if isinstance(data, (str, bytes)):
@@ -655,6 +656,7 @@ def from_xml(cls, data: Union['Element', str, bytes, Any]) -> 'Bom':
             A new Bom instance
         """
         from xml.etree.ElementTree import Element, fromstring, parse
+
         from ..serialization import make_converter
 
         if isinstance(data, (str, bytes)):

cyclonedx/model/component.py

@@ -15,6 +15,35 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
 
+from .._internal.bom_ref import bom_ref_from_str as _bom_ref_from_str
+from ..serialization import ALL_VERSIONS, VERSIONS_1_1_AND_LATER
+from ..schema import SchemaVersion
+from .release_note import ReleaseNotes
+from .license import License, LicenseRepository
+from .issue import IssueType
+from .dependency import Dependable
+from .crypto import CryptoProperties
+from .contact import OrganizationalContact, OrganizationalEntity
+from .component_evidence import ComponentEvidence
+from .bom_ref import BomRef
+from . import AttachedText, ExternalReference, HashAlgorithm, HashType, IdentifiableAction, Property, XsUri
+from ..serialization import (
+    METADATA_KEY_INCLUDE_NONE,
+    METADATA_KEY_JSON_NAME,
+    METADATA_KEY_VERSIONS,
+    METADATA_KEY_XML_ATTR,
+    METADATA_KEY_XML_NAME,
+    METADATA_KEY_XML_SEQUENCE,
+    VERSIONS_1_0_THROUGH_1_3,
+    VERSIONS_1_1_AND_LATER,
+    VERSIONS_1_2_AND_LATER,
+    VERSIONS_1_3_AND_LATER,
+    VERSIONS_1_4_AND_LATER,
+    VERSIONS_1_6_AND_LATER,
+)
+from ..exception.serialization import CycloneDxDeserializationException, SerializationOfUnexpectedValueException
+from ..exception.model import InvalidOmniBorIdException, InvalidSwhidException
+from .._internal.compare import ComparablePackageURL as _ComparablePackageURL
 import re
 import sys
 from collections.abc import Iterable
@@ -42,45 +71,6 @@ def _sortedset_converter(value: Any) -> SortedSet:
         return SortedSet(value)
     return SortedSet([value])
 
-from .._internal.bom_ref import bom_ref_from_str as _bom_ref_from_str
-from .._internal.compare import ComparablePackageURL as _ComparablePackageURL
-from ..exception.model import InvalidOmniBorIdException, InvalidSwhidException
-from ..exception.serialization import (
-    CycloneDxDeserializationException,
-    SerializationOfUnexpectedValueException,
-)
-from ..serialization import (
-    METADATA_KEY_INCLUDE_NONE,
-    METADATA_KEY_JSON_NAME,
-    METADATA_KEY_VERSIONS,
-    METADATA_KEY_XML_ATTR,
-    METADATA_KEY_XML_NAME,
-    METADATA_KEY_XML_SEQUENCE,
-    VERSIONS_1_0_THROUGH_1_3,
-    VERSIONS_1_1_AND_LATER,
-    VERSIONS_1_2_AND_LATER,
-    VERSIONS_1_3_AND_LATER,
-    VERSIONS_1_4_AND_LATER,
-    VERSIONS_1_6_AND_LATER,
-)
-from . import (
-    AttachedText,
-    ExternalReference,
-    HashAlgorithm,
-    HashType,
-    IdentifiableAction,
-    Property,
-    XsUri,
-)
-from .bom_ref import BomRef
-from .component_evidence import ComponentEvidence
-from .contact import OrganizationalContact, OrganizationalEntity
-from .crypto import CryptoProperties
-from .dependency import Dependable
-from .issue import IssueType
-from .license import License, LicenseRepository
-from .release_note import ReleaseNotes
-
 
 def _bom_ref_converter(value: Optional[Union[str, BomRef]]) -> BomRef:
     """Convert string or BomRef to BomRef."""
@@ -165,9 +155,6 @@ class ComponentScope(str, Enum):
 
 
 # Component scope support by schema version
-from ..serialization import ALL_VERSIONS, VERSIONS_1_1_AND_LATER
-from ..schema import SchemaVersion
-
 COMPONENT_SCOPE_VERSIONS: dict[ComponentScope, set[SchemaVersion]] = {
     ComponentScope.REQUIRED: ALL_VERSIONS,
     ComponentScope.OPTIONAL: ALL_VERSIONS,
@@ -350,7 +337,8 @@ class Swid:
     tag_id: str = attrs.field(metadata={METADATA_KEY_JSON_NAME: 'tagId', METADATA_KEY_XML_ATTR: True})
     name: str = attrs.field(metadata={METADATA_KEY_XML_ATTR: True})
     version: Optional[str] = attrs.field(default=None, metadata={METADATA_KEY_XML_ATTR: True})
-    tag_version: Optional[int] = attrs.field(default=None, metadata={METADATA_KEY_JSON_NAME: 'tagVersion', METADATA_KEY_XML_ATTR: True})
+    tag_version: Optional[int] = attrs.field(
+        default=None, metadata={METADATA_KEY_JSON_NAME: 'tagVersion', METADATA_KEY_XML_ATTR: True})
     patch: Optional[bool] = attrs.field(default=None, metadata={METADATA_KEY_XML_ATTR: True})
     text: Optional[AttachedText] = attrs.field(default=None)
     url: Optional[XsUri] = attrs.field(default=None)

cyclonedx/model/component_evidence.py

@@ -347,7 +347,7 @@ class CallStack:
     .. note::
         See the CycloneDX Schema definition: https://cyclonedx.org/docs/1.7/json/#components_items_evidence_callstack
     """
-    frames: List[CallStackFrame] = attrs.field(
+    frames: list[CallStackFrame] = attrs.field(
         factory=list,
         metadata={METADATA_KEY_XML_SEQUENCE: 1}
     )

cyclonedx/model/dependency.py

@@ -23,10 +23,7 @@
 import attrs
 from sortedcontainers import SortedSet
 
-from ..serialization import (
-    METADATA_KEY_JSON_NAME,
-    METADATA_KEY_XML_ATTR,
-)
+from ..serialization import METADATA_KEY_JSON_NAME, METADATA_KEY_XML_ATTR
 from .bom_ref import BomRef
 
 

cyclonedx/model/issue.py

@@ -15,17 +15,16 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
 
+from ..serialization import ALL_VERSIONS
+from ..schema import SchemaVersion
 from collections.abc import Iterable
 from enum import Enum
 from typing import Any, Optional
 
 import attrs
 from sortedcontainers import SortedSet
 
-from ..serialization import (
-    METADATA_KEY_XML_ATTR,
-    METADATA_KEY_XML_SEQUENCE,
-)
+from ..serialization import METADATA_KEY_XML_ATTR, METADATA_KEY_XML_SEQUENCE
 from . import XsUri
 
 
@@ -42,9 +41,6 @@ class IssueClassification(str, Enum):
 
 
 # Issue classification support by schema version
-from ..serialization import ALL_VERSIONS
-from ..schema import SchemaVersion
-
 ISSUE_CLASSIFICATION_VERSIONS: dict[IssueClassification, set[SchemaVersion]] = {
     IssueClassification.DEFECT: ALL_VERSIONS,
     IssueClassification.ENHANCEMENT: ALL_VERSIONS,

cyclonedx/model/release_note.py

@@ -22,9 +22,9 @@
 import attrs
 from sortedcontainers import SortedSet
 
-from ..serialization import METADATA_KEY_XML_SEQUENCE
 from ..model import Note, Property, XsUri
 from ..model.issue import IssueType
+from ..serialization import METADATA_KEY_XML_SEQUENCE
 
 
 def _sortedset_factory() -> SortedSet:

cyclonedx/model/service.py

@@ -24,6 +24,22 @@
 """
 
 
+from .._internal.bom_ref import bom_ref_from_str as _bom_ref_from_str
+from .release_note import ReleaseNotes
+from .license import License, LicenseRepository
+from .dependency import Dependable
+from .contact import OrganizationalEntity
+from .bom_ref import BomRef
+from . import DataClassification, ExternalReference, Property, XsUri
+from ..serialization import (
+    METADATA_KEY_JSON_NAME,
+    METADATA_KEY_VERSIONS,
+    METADATA_KEY_XML_ATTR,
+    METADATA_KEY_XML_NAME,
+    METADATA_KEY_XML_SEQUENCE,
+    VERSIONS_1_3_AND_LATER,
+    VERSIONS_1_4_AND_LATER,
+)
 from collections.abc import Iterable
 from typing import Any, Optional, Union
 
@@ -41,23 +57,6 @@ def _sortedset_converter(value: Any) -> SortedSet:
         return SortedSet(value)
     return SortedSet([value])
 
-from .._internal.bom_ref import bom_ref_from_str as _bom_ref_from_str
-from ..serialization import (
-    METADATA_KEY_JSON_NAME,
-    METADATA_KEY_VERSIONS,
-    METADATA_KEY_XML_ATTR,
-    METADATA_KEY_XML_NAME,
-    METADATA_KEY_XML_SEQUENCE,
-    VERSIONS_1_3_AND_LATER,
-    VERSIONS_1_4_AND_LATER,
-)
-from . import DataClassification, ExternalReference, Property, XsUri
-from .bom_ref import BomRef
-from .contact import OrganizationalEntity
-from .dependency import Dependable
-from .license import License, LicenseRepository
-from .release_note import ReleaseNotes
-
 
 def _bom_ref_converter(value: Optional[Union[str, BomRef]]) -> BomRef:
     """Convert string or BomRef to BomRef."""

cyclonedx/model/tool.py

@@ -24,11 +24,7 @@
 import attrs
 from sortedcontainers import SortedSet
 
-from ..serialization import (
-    METADATA_KEY_VERSIONS,
-    METADATA_KEY_XML_SEQUENCE,
-    VERSIONS_1_4_AND_LATER,
-)
+from ..serialization import METADATA_KEY_VERSIONS, METADATA_KEY_XML_SEQUENCE, VERSIONS_1_4_AND_LATER
 from . import ExternalReference, HashType
 
 if TYPE_CHECKING:  # pragma: no cover

cyclonedx/model/vulnerability.py

@@ -28,6 +28,15 @@
     See the CycloneDX Schema extension definition https://cyclonedx.org/docs/1.7/xml/#type_vulnerabilitiesType
 """
 
+from .contact import OrganizationalContact, OrganizationalEntity
+from ..serialization import ALL_VERSIONS, VERSIONS_1_4_AND_LATER, VERSIONS_1_5_AND_LATER
+from .tool import Tool, ToolRepository
+from .impact_analysis import (
+    ImpactAnalysisAffectedStatus,
+    ImpactAnalysisJustification,
+    ImpactAnalysisResponse,
+    ImpactAnalysisState,
+)
 import re
 import sys
 from collections.abc import Iterable
@@ -61,14 +70,6 @@ def _sortedset_converter(value: Any) -> SortedSet:
     if isinstance(value, Iterable) and not isinstance(value, (str, bytes, dict)):
         return SortedSet(value)
     return SortedSet([value])
-from .contact import OrganizationalContact, OrganizationalEntity
-from .impact_analysis import (
-    ImpactAnalysisAffectedStatus,
-    ImpactAnalysisJustification,
-    ImpactAnalysisResponse,
-    ImpactAnalysisState,
-)
-from .tool import Tool, ToolRepository
 
 
 @define
@@ -389,7 +390,6 @@ def get_value_pre_1_4(self) -> str:
 
 
 # VulnerabilityScoreSource support by schema version
-from ..serialization import ALL_VERSIONS, VERSIONS_1_4_AND_LATER, VERSIONS_1_5_AND_LATER
 
 VULNERABILITY_SCORE_SOURCE_VERSIONS: dict[VulnerabilityScoreSource, set[SchemaVersion]] = {
     VulnerabilityScoreSource.CVSS_V2: ALL_VERSIONS,