imports -> import_

Match the name in v3.0.1 Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
spdx · bact · Oct 8, 2024 · Oct 8, 2024 · Oct 9, 2024 · Oct 9, 2024
commit f5c497ad797ca7b3f68f8e10bdb719e9d04b82e8
diff --git a/src/spdx_tools/spdx3/bump_from_spdx2/creation_info.py b/src/spdx_tools/spdx3/bump_from_spdx2/creation_info.py
@@ -19,7 +19,7 @@ def bump_creation_info(spdx2_creation_info: Spdx2_CreationInfo, payload: Payload
 
     print_missing_conversion("creation_info.document_namespace", 0, "https://github.com/spdx/spdx-3-model/issues/87")
 
-    namespaces, imports = (
+    namespace, import_ = (
         zip(
             *[
                 bump_external_document_ref(external_document_ref)
@@ -29,8 +29,8 @@ def bump_creation_info(spdx2_creation_info: Spdx2_CreationInfo, payload: Payload
         if spdx2_creation_info.external_document_refs
         else ([], [])
     )
-    namespaces = list(namespaces)
-    imports = list(imports)
+    namespace = list(namespace)
+    import_ = list(import_)
     print_missing_conversion(
         "creation_info.license_list_version",
         0,
@@ -74,6 +74,6 @@ def bump_creation_info(spdx2_creation_info: Spdx2_CreationInfo, payload: Payload
         comment=spdx2_creation_info.document_comment,
         element=[],
         root_element=[],
-        imports=imports,
-        namespaces=namespaces,
+        import_=import_,
+        namespace=namespace,
     )
diff --git a/src/spdx_tools/spdx3/bump_from_spdx2/file.py b/src/spdx_tools/spdx3/bump_from_spdx2/file.py
@@ -18,11 +18,11 @@ def bump_file(
     payload: Payload,
     document_namespace: str,
     external_document_refs: List[ExternalDocumentRef],
-    imports: List[ExternalMap],
+    import_: List[ExternalMap],
 ):
     spdx_id = get_full_element_spdx_id(spdx2_file, document_namespace, external_document_refs)
     if ":" in spdx2_file.spdx_id:
-        imports.append(
+        import_.append(
             ExternalMap(
                 external_id=spdx2_file.spdx_id,
                 defining_document=f"{spdx2_file.spdx_id.split(':')[0]}:SPDXRef-DOCUMENT",

diff --git a/src/spdx_tools/spdx3/bump_from_spdx2/package.py b/src/spdx_tools/spdx3/bump_from_spdx2/package.py
@@ -28,11 +28,11 @@ def bump_package(
     payload: Payload,
     document_namespace: str,
     external_document_refs: List[ExternalDocumentRef],
-    imports: List[ExternalMap],
+    import_: List[ExternalMap],
 ):
     spdx_id = get_full_element_spdx_id(spdx2_package, document_namespace, external_document_refs)
     if ":" in spdx2_package.spdx_id:
-        imports.append(
+        import_.append(
             ExternalMap(
                 external_id=spdx2_package.spdx_id,
                 defining_document=f"{spdx2_package.spdx_id.split(':')[0]}:SPDXRef-DOCUMENT",

diff --git a/src/spdx_tools/spdx3/bump_from_spdx2/relationship.py b/src/spdx_tools/spdx3/bump_from_spdx2/relationship.py
@@ -222,7 +222,7 @@ def determine_completeness_and_to(
 ) -> Tuple[Optional[RelationshipCompleteness], List[str]]:
     if isinstance(related_spdx_element_id, SpdxNoAssertion):
         completeness = RelationshipCompleteness.NOASSERTION
-        to = []
+        to: List[str] = []
     elif isinstance(related_spdx_element_id, SpdxNone):
         completeness = RelationshipCompleteness.COMPLETE
         to = []

diff --git a/src/spdx_tools/spdx3/bump_from_spdx2/snippet.py b/src/spdx_tools/spdx3/bump_from_spdx2/snippet.py
@@ -22,11 +22,11 @@ def bump_snippet(
     payload: Payload,
     document_namespace: str,
     external_document_refs: List[ExternalDocumentRef],
-    imports: List[ExternalMap],
+    import_: List[ExternalMap],
 ):
     spdx_id = get_full_element_spdx_id(spdx2_snippet, document_namespace, external_document_refs)
     if ":" in spdx2_snippet.spdx_id:
-        imports.append(
+        import_.append(
             ExternalMap(
                 external_id=spdx2_snippet.spdx_id,
                 defining_document=f"{spdx2_snippet.spdx_id.split(':')[0]}:SPDXRef-DOCUMENT",

diff --git a/src/spdx_tools/spdx3/bump_from_spdx2/spdx_document.py b/src/spdx_tools/spdx3/bump_from_spdx2/spdx_document.py
@@ -39,7 +39,7 @@ def bump_spdx_document(document: Spdx2_Document) -> Payload:
             payload,
             document_namespace,
             document.creation_info.external_document_refs,
-            spdx_document.imports,
+            spdx_document.import_,
         )
 
     for spdx2_file in document.files:
@@ -48,7 +48,7 @@ def bump_spdx_document(document: Spdx2_Document) -> Payload:
             payload,
             document_namespace,
             document.creation_info.external_document_refs,
-            spdx_document.imports,
+            spdx_document.import_,
         )
 
     for spdx2_snippet in document.snippets:
@@ -57,7 +57,7 @@ def bump_spdx_document(document: Spdx2_Document) -> Payload:
             payload,
             document_namespace,
             document.creation_info.external_document_refs,
-            spdx_document.imports,
+            spdx_document.import_,
         )
 
     bump_relationships(document.relationships, payload, document_namespace)

diff --git a/src/spdx_tools/spdx3/model/core/bundle.py b/src/spdx_tools/spdx3/model/core/bundle.py
@@ -42,5 +42,5 @@ def __init__(
         external_reference = [] if not external_reference else external_reference
         external_identifier = [] if not external_identifier else external_identifier
         namespace = [] if not namespace else namespace
-        import_ = [] if import_ is None else import_
+        import_ = [] if not import_  else import_
         check_types_and_set_values(self, locals())
diff --git a/src/spdx_tools/spdx3/model/core/lifecycle_scoped_relationship.py b/src/spdx_tools/spdx3/model/core/lifecycle_scoped_relationship.py
@@ -52,8 +52,8 @@ def __init__(
         end_time: Optional[dat
10000
etime] = None,
         scope: Optional[LifecycleScopeType] = None,
     ):
-        to = [] if to is None else to
-        verified_using = [] if verified_using is None else verified_using
-        external_reference = [] if external_reference is None else external_reference
-        external_identifier = [] if external_identifier is None else external_identifier
+        to = [] if not to else to
+        verified_using = [] if not verified_using else verified_using
+        external_reference = [] if not external_reference else external_reference
+        external_identifier = [] if not external_identifier else external_identifier
         check_types_and_set_values(self, locals())
diff --git a/src/spdx_tools/spdx3/model/core/profile_identifier.py b/src/spdx_tools/spdx3/model/core/profile_identifier.py
@@ -12,5 +12,5 @@ class ProfileIdentifierType(Enum):
     BUILD = auto()
     AI = auto()
     DATASET = auto()
-    USAGE = auto()
+    USAGE = auto()  # Not present in v3.0.1
     EXTENSION = auto()
diff --git a/src/spdx_tools/spdx3/model/core/spdx_collection.py b/src/spdx_tools/spdx3/model/core/spdx_collection.py
@@ -16,8 +16,8 @@ class ElementCollection(Element):
     # the __init__ method still raises an error if required fields are not set
     element: List[str] = field(default_factory=list)
     root_element: List[str] = field(default_factory=list)
-    namespaces: List[NamespaceMap] = field(default_factory=list)
-    imports: List[ExternalMap] = field(default_factory=list)
+    namespace: List[NamespaceMap] = field(default_factory=list)
+    import_: List[ExternalMap] = field(default_factory=list)
 
     @abstractmethod
     def __init__(self):

diff --git a/src/spdx_tools/spdx3/model/licensing/listed_license_exception.py b/src/spdx_tools/spdx3/model/licensing/listed_license_exception.py
@@ -19,12 +19,12 @@ def __init__(
         addition_name: str,
         addition_text: str,
         addition_comment: Optional[str] = None,
-        see_also: List[str] = None,
+        see_also: List[str] = [],
         standard_addition_template: Optional[str] = None,
         is_deprecated_addition_id: Optional[bool] = None,
         obsoleted_by: Optional[str] = None,
         list_version_added: Optional[str] = None,
         deprecated_version: Optional[str] = None,
     ):
-        see_also = [] if see_also is None else see_also
+        see_also = [] if not see_also else see_also
         check_types_and_set_values(self, locals())
diff --git a/src/spdx_tools/spdx3/model/security/__init__.py b/src/spdx_tools/spdx3/model/security/__init__.py
@@ -4,15 +4,43 @@
 from .cvss_v2_vuln_assessment_relationship import CvssV2VulnAssessmentRelationship
 from .cvss_v3_vuln_assessment_relationship import CvssV3VulnAssessmentRelationship
 from .epss_vuln_assessment_relationship import EpssVulnAssessmentRelationship
-from .exploit_catalog_vuln_assessment_relationship import ExploitCatalogVulnAssessmentRelationship, ExploitCatalogType
-from .ssvc_vuln_assessment_relationship import SsvcVulnAssessmentRelationship, SsvcDecisionType
-from .vex_affected_vuln_assessment_relationship import VexAffectedVulnAssessmentRelationship
+from .exploit_catalog_vuln_assessment_relationship import (
+    ExploitCatalogType,
+    ExploitCatalogVulnAssessmentRelationship,
+)
+from .ssvc_vuln_assessment_relationship import (
+    SsvcDecisionType,
+    SsvcVulnAssessmentRelationship,
+)
+from .vex_affected_vuln_assessment_relationship import (
+    VexAffectedVulnAssessmentRelationship,
+)
 from .vex_fixed_vuln_assessment_relationship import VexFixedVulnAssessmentRelationship
 from .vex_not_affected_vuln_assessment_relationship import (
     VexNotAffectedVulnAssessmentRelationship,
     VexJustificationType,
 )
-from .vex_under_investigation_vuln_assessment_relationship import VexUnderInvestigationVulnAssessmentRelationship
+from .vex_under_investigation_vuln_assessment_relationship import (
+    VexUnderInvestigationVulnAssessmentRelationship,
+)
 from .vex_vuln_assessment_relationship import VexVulnAssessmentRelationship
 from .vuln_assessment_relationship import VulnAssessmentRelationship
 from .vulnerability import Vulnerability
+
+__all__ = [
+    "CvssV2VulnAssessmentRelationship",
+    "CvssV3VulnAssessmentRelationship",
+    "EpssVulnAssessmentRelationship",
+    "ExploitCatalogType",
+    "ExploitCatalogVulnAssessmentRelationship",
+    "SsvcDecisionType",
+    "SsvcVulnAssessmentRelationship",
+    "VexAffectedVulnAssessmentRelationship",
+    "VexFixedVulnAssessmentRelationship",
+    "VexNotAffectedVulnAssessmentRelationship",
+    "VexJustificationType",
+    "VexUnderInvestigationVulnAssessmentRelationship",
+    "VexVulnAssessmentRelationship",
+    "VulnAssessmentRelationship",
+    "Vulnerability",
+]
diff --git a/src/spdx_tools/spdx3/model/security/cvss_v2_vuln_assessment_relationship.py b/src/spdx_tools/spdx3/model/security/cvss_v2_vuln_assessment_relationship.py
@@ -20,7 +20,7 @@
 
 @dataclass_with_properties
 class CvssV2VulnAssessmentRelationship(VulnAssessmentRelationship):
-    score: str = None
+    score: str = ""
     severity: Optional[str] = None
     vector: Optional[str] = None
 
@@ -36,9 +36,9 @@ def __init__(
         summary: Optional[str] = None,
         description: Optional[str] = None,
         comment: Optional[str] = None,
-        verified_using: List[IntegrityMethod] = None,
-        external_reference: List[ExternalReference] = None,
-        external_identifier: List[ExternalIdentifier] = None,
+        verified_using: List[IntegrityMethod] = [],
+        external_reference: List[ExternalReference] = [],
+        external_identifier: List[ExternalIdentifier] = [],
         extension: Optional[str] = None,
         completeness: Optional[RelationshipCompleteness] = None,
         start_time: Optional[datetime] = None,
@@ -51,7 +51,7 @@ def __init__(
         severity: Optional[str] = None,
         vector: Optional[str] = None,
     ):
-        verified_using = [] if verified_using is None else verified_using
-        external_reference = [] if external_reference is None else external_reference
-        external_identifier = [] if external_identifier is None else external_identifier
+        verified_using = [] if not verified_using else verified_using
+        external_reference = [] if not external_reference else external_reference
+        external_identifier = [] if not external_identifier else external_identifier
         check_types_and_set_values(self, locals())
diff --git a/src/spdx_tools/spdx3/model/security/cvss_v3_vuln_assessment_relationship.py b/src/spdx_tools/spdx3/model/security/cvss_v3_vuln_assessment_relationship.py
@@ -36,9 +36,9 @@ def __init__(
         summary: Optional[str] = None,
         description: Optional[str] = None,
         comment: Optional[str] = None,
-        verified_using: List[IntegrityMethod] = None,
-        external_reference: List[ExternalReference] = None,
-        external_identifier: List[ExternalIdentifier] = None,
+        verified_using: List[IntegrityMethod] = [],
+        external_reference: List[ExternalReference] = [],
+        external_identifier: List[ExternalIdentifier] = [],
         extension: Optional[str] = None,
         completeness: Optional[RelationshipCompleteness] = None,
         start_time: Optional[datetime] = None,
@@ -51,7 +51,7 @@ def __init__(
         severity: Optional[str] = None,
         vector: Optional[str] = None,
     ):
-        verified_using = [] if verified_using is None else verified_using
-        external_reference = [] if external_reference is None else external_reference
-        external_identifier = [] if external_identifier is None else external_identifier
+        verified_using = [] if not verified_using else verified_using
+        external_reference = [] if not external_reference else external_reference
+        external_identifier = [] if not external_identifier else external_identifier
         check_types_and_set_values(self, locals())
diff --git a/src/spdx_tools/spdx3/model/security/epss_vuln_assessment_relationship.py b/src/spdx_tools/spdx3/model/security/epss_vuln_assessment_relationship.py
@@ -35,9 +35,9 @@ def __init__(
         summary: Optional[str] = None,
         description: Optional[str] = None,
         comment: Optional[str] = None,
-        verified_using: List[IntegrityMethod] = None,
-        external_reference: List[ExternalReference] = None,
-        external_identifier: List[ExternalIdentifier] = None,
+        verified_using: List[IntegrityMethod] = [],
+        external_reference: List[ExternalReference] = [],
+        external_identifier: List[ExternalIdentifier] = [],
         extension: Optional[str] = None,
         completeness: Optional[RelationshipCompleteness] = None,
         start_time: Optional[datetime] = None,
@@ -49,7 +49,7 @@ def __init__(
         withdrawn_time: Optional[datetime] = None,
         severity: Optional[str] = None,
     ):
-        verified_using = [] if verified_using is None else verified_using
-        external_reference = [] if external_reference is None else external_reference
-        external_identifier = [] if external_identifier is None else external_identifier
+        verified_using = [] if not verified_using else verified_using
+        external_reference = [] if not external_reference else external_reference
+        external_identifier = [] if not external_identifier else external_identifier
         check_types_and_set_values(self, locals())
diff --git a/src/spdx_tools/spdx3/model/security/exploit_catalog_vuln_assessment_relationship.py b/src/spdx_tools/spdx3/model/security/exploit_catalog_vuln_assessment_relationship.py
@@ -44,9 +44,9 @@ def __init__(
         summary: Optional[str] = None,
         description: Optional[str] = None,
         comment: Optional[str] = None,
-        verified_using: List[IntegrityMethod] = None,
-        external_reference: List[ExternalReference] = None,
-        external_identifier: List[ExternalIdentifier] = None,
+        verified_using: List[IntegrityMethod] = [],
+        external_reference: List[ExternalReference] = [],
+        external_identifier: List[ExternalIdentifier] = [],
         extension: Optional[str] = None,
         completeness: Optional[RelationshipCompleteness] = None,
         start_time: Optional[datetime] = None,
@@ -57,7 +57,7 @@ def __init__(
         modified_time: Optional[datetime] = None,
         withdrawn_time: Optional[datetime] = None,
     ):
-        verified_using = [] if verified_using is None else verified_using
-        external_reference = [] if external_reference is None else external_reference
-        external_identifier = [] if external_identifier is None else external_identifier
+        verified_using = [] if not verified_using else verified_using
+        external_reference = [] if not external_reference else external_reference
+        external_identifier = [] if not external_identifier else external_identifier
         check_types_and_set_values(self, locals())
diff --git a/src/spdx_tools/spdx3/model/security/ssvc_vuln_assessment_relationship.py b/src/spdx_tools/spdx3/model/security/ssvc_vuln_assessment_relationship.py
@@ -42,9 +42,9 @@ def __init__(
         summary: Optional[str] = None,
         description: Optional[str] = None,
         comment: Optional[str] = None,
-        verified_using: List[IntegrityMethod] = None,
-        external_reference: List[ExternalReference] = None,
-        external_identifier: List[ExternalIdentifier] = None,
+        verified_using: List[IntegrityMethod] = [],
+        external_reference: List[ExternalReference] = [],
+        external_identifier: List[ExternalIdentifier] = [],
         extension: Optional[str] = None,
         completeness: Optional[RelationshipCompleteness] = None,
         start_time: Optional[datetime] = None,
@@ -55,7 +55,7 @@ def __init__(
         modified_time: Optional[datetime] = None,
         withdrawn_time: Optional[datetime] = None,
     ):
-        verified_using = [] if verified_using is None else verified_using
-        external_reference = [] if external_reference is None else external_reference
-        external_identifier = [] if external_identifier is None else external_identifier
+        verified_using = [] if not verified_using else verified_using
+        external_reference = [] if not external_reference else external_reference
+        external_identifier = [] if not external_identifier else external_identifier
         check_types_and_set_values(self, locals())
diff --git a/src/spdx_tools/spdx3/model/security/vex_affected_vuln_assessment_relationship.py b/src/spdx_tools/spdx3/model/security/vex_affected_vuln_assessment_relationship.py
@@ -35,9 +35,9 @@ def __init__(
         summary: Optional[str] = None,
         description: Optional[str] = None,
         comment: Optional[str] = None,
-        verified_using: List[IntegrityMethod] = None,
-        external_reference: List[ExternalReference] = None,
-        external_identifier: List[ExternalIdentifier] = None,
+        verified_using: List[IntegrityMethod] = [],
+        external_reference: List[ExternalReference] = [],
+        external_identifier: List[ExternalIdentifier] = [],
         extension: Optional[str] = None,
         completeness: Optional[RelationshipCompleteness] = None,
         start_time: Optional[datetime] = None,
@@ -50,10 +50,10 @@ def __init__(
         vex_version: Optional[str] = None,
         status_notes: Optional[str] = None,
         action_statement: Optional[str] = None,
-        action_statement_time: List[datetime] = None,
+        action_statement_time: List[datetime] = [],
     ):
-        verified_using = [] if verified_using is None else verified_using
-        external_reference = [] if external_reference is None else external_reference
-        external_identifier = [] if external_identifier is None else external_identifier
-        action_statement_time = [] if action_statement_time is None else action_statement_time
+        verified_using = [] if not verified_using else verified_using
+        external_reference = [] if not external_reference else external_reference
+        external_identifier = [] if not external_identifier else external_identifier
+        action_statement_time = [] if not action_statement_time else action_statement_time
         check_types_and_set_values(self, locals())
diff --git a/src/spdx_tools/spdx3/model/security/vex_fixed_vuln_assessment_relationship.py b/src/spdx_tools/spdx3/model/security/vex_fixed_vuln_assessment_relationship.py
@@ -31,9 +31,9 @@ def __init__(
         summary: Optional[str] = None,
         description: Optional[str] = None,
         comment: Optional[str] = None,
-        verified_using: List[IntegrityMethod] = None,
-        external_reference: List[ExternalReference] = None,
-        external_identifier: List[ExternalIdentifier] = None,
+        verified_using: List[IntegrityMethod] = [],
+        external_reference: List[ExternalReference] = [],
+        external_identifier: List[ExternalIdentifier] = [],
         extension: Optional[str] = None,
         completeness: Optional[RelationshipCompleteness] = None,
         start_time: Optional[datetime] = None,
@@ -46,7 +46,7 @@ def __init__(
         vex_version: Optional[str] = None,
         status_notes: Optional[str] = None,
     ):
-        verified_using = [] if verified_using is None else verified_using
-        external_reference = [] if external_reference is None else external_reference
-        external_identifier = [] if external_identifier is None else external_identifier
+        verified_using = [] if not verified_using else verified_using
+        external_reference = [] if not external_reference else external_reference
+        external_identifier = [] if not external_identifier else external_identifier
         check_types_and_set_values(self, locals())