diff --git a/src/spdx_tools/spdx/jsonschema/annotation_converter.py b/src/spdx_tools/spdx/jsonschema/annotation_converter.py index 16645a216..9d217fcd1 100644 --- a/src/spdx_tools/spdx/jsonschema/annotation_converter.py +++ b/src/spdx_tools/spdx/jsonschema/annotation_converter.py @@ -12,7 +12,7 @@ class AnnotationConverter(TypedConverter[Annotation]): def _get_property_value( - self, annotation: Annotation, annotation_property: AnnotationProperty, document: Document = None + self, annotation: Annotation, annotation_property: AnnotationProperty, document: Document | None = None ) -> Any: if annotation_property == AnnotationProperty.ANNOTATION_DATE: return datetime_to_iso_string(annotation.annotation_date) diff --git a/src/spdx_tools/spdx/jsonschema/checksum_converter.py b/src/spdx_tools/spdx/jsonschema/checksum_converter.py index 9ffb39b11..bca7fdb82 100644 --- a/src/spdx_tools/spdx/jsonschema/checksum_converter.py +++ b/src/spdx_tools/spdx/jsonschema/checksum_converter.py @@ -17,7 +17,7 @@ def get_json_type(self) -> Type[JsonProperty]: return ChecksumProperty def _get_property_value( - self, checksum: Checksum, checksum_property: ChecksumProperty, _document: Document = None + self, checksum: Checksum, checksum_property: ChecksumProperty, _document: Document | None = None ) -> str: if checksum_property == ChecksumProperty.ALGORITHM: return algorithm_to_json_string(checksum.algorithm) diff --git a/src/spdx_tools/spdx/jsonschema/converter.py b/src/spdx_tools/spdx/jsonschema/converter.py index 55629f2ae..7da197803 100644 --- a/src/spdx_tools/spdx/jsonschema/converter.py +++ b/src/spdx_tools/spdx/jsonschema/converter.py @@ -33,7 +33,7 @@ class TypedConverter(ABC, Generic[T]): """ @abstractmethod - def _get_property_value(self, instance: T, json_property: JsonProperty, document: Document = None) -> Any: + def _get_property_value(self, instance: T, json_property: JsonProperty, document: Document | None = None) -> Any: raise NotImplementedError(MISSING_IMPLEMENTATION_MESSAGE) @abstractmethod @@ -50,7 +50,7 @@ def json_property_name(self, json_property: JsonProperty) -> str: def requires_full_document(self) -> bool: return False - def convert(self, instance: T, document: Document = None) -> Dict: + def convert(self, instance: T, document: Document | None = None) -> Dict: if not isinstance(instance, self.get_data_model_type()): raise TypeError( f"Converter of type {self.__class__} can only convert objects of type " diff --git a/src/spdx_tools/spdx/jsonschema/creation_info_converter.py b/src/spdx_tools/spdx/jsonschema/creation_info_converter.py index 0a2ef875c..504a1cc4e 100644 --- a/src/spdx_tools/spdx/jsonschema/creation_info_converter.py +++ b/src/spdx_tools/spdx/jsonschema/creation_info_converter.py @@ -19,7 +19,10 @@ def get_json_type(self) -> Type[JsonProperty]: return CreationInfoProperty def _get_property_value( - self, creation_info: CreationInfo, creation_info_property: CreationInfoProperty, _document: Document = None + self, + creation_info: CreationInfo, + creation_info_property: CreationInfoProperty, + _document: Document | None = None, ) -> Any: if creation_info_property == CreationInfoProperty.CREATED: return datetime_to_iso_string(creation_info.created) diff --git a/src/spdx_tools/spdx/jsonschema/document_converter.py b/src/spdx_tools/spdx/jsonschema/document_converter.py index a3c2e3699..49c4051cf 100644 --- a/src/spdx_tools/spdx/jsonschema/document_converter.py +++ b/src/spdx_tools/spdx/jsonschema/document_converter.py @@ -50,7 +50,7 @@ def json_property_name(self, document_property: DocumentProperty) -> str: return super().json_property_name(document_property) def _get_property_value( - self, document: Document, document_property: DocumentProperty, _document: Document = None + self, document: Document, document_property: DocumentProperty, _document: Document | None = None ) -> Any: if document_property == DocumentProperty.SPDX_ID: return document.creation_info.spdx_id diff --git a/src/spdx_tools/spdx/jsonschema/external_document_ref_converter.py b/src/spdx_tools/spdx/jsonschema/external_document_ref_converter.py index f25bf56e3..7ad2dd772 100644 --- a/src/spdx_tools/spdx/jsonschema/external_document_ref_converter.py +++ b/src/spdx_tools/spdx/jsonschema/external_document_ref_converter.py @@ -20,7 +20,7 @@ def _get_property_value( self, external_document_ref: ExternalDocumentRef, external_document_ref_property: ExternalDocumentRefProperty, - _document: Document = None, + _document: Document | None = None, ) -> Any: if external_document_ref_property == ExternalDocumentRefProperty.EXTERNAL_DOCUMENT_ID: return external_document_ref.document_ref_id diff --git a/src/spdx_tools/spdx/jsonschema/external_package_ref_converter.py b/src/spdx_tools/spdx/jsonschema/external_package_ref_converter.py index 732673c36..9af23cd87 100644 --- a/src/spdx_tools/spdx/jsonschema/external_package_ref_converter.py +++ b/src/spdx_tools/spdx/jsonschema/external_package_ref_converter.py @@ -14,7 +14,7 @@ def _get_property_value( self, external_ref: ExternalPackageRef, external_ref_property: ExternalPackageRefProperty, - document: Document = None, + document: Document | None = None, ) -> Any: if external_ref_property == ExternalPackageRefProperty.COMMENT: return external_ref.comment diff --git a/src/spdx_tools/spdx/jsonschema/extracted_licensing_info_converter.py b/src/spdx_tools/spdx/jsonschema/extracted_licensing_info_converter.py index 9bf0a8530..57a7e59f8 100644 --- a/src/spdx_tools/spdx/jsonschema/extracted_licensing_info_converter.py +++ b/src/spdx_tools/spdx/jsonschema/extracted_licensing_info_converter.py @@ -15,7 +15,7 @@ def _get_property_value( self, extracted_licensing_info: ExtractedLicensingInfo, extracted_licensing_info_property: ExtractedLicensingInfoProperty, - document: Document = None, + document: Document | None = None, ) -> Any: if extracted_licensing_info_property == ExtractedLicensingInfoProperty.COMMENT: return extracted_licensing_info.comment diff --git a/src/spdx_tools/spdx/jsonschema/file_converter.py b/src/spdx_tools/spdx/jsonschema/file_converter.py index 7c8ae4ad1..b21a82a85 100644 --- a/src/spdx_tools/spdx/jsonschema/file_converter.py +++ b/src/spdx_tools/spdx/jsonschema/file_converter.py @@ -25,7 +25,7 @@ def json_property_name(self, file_property: FileProperty) -> str: return "SPDXID" return super().json_property_name(file_property) - def _get_property_value(self, file: Any, file_property: FileProperty, document: Document = None) -> Any: + def _get_property_value(self, file: Any, file_property: FileProperty, document: Document | None = None) -> Any: if file_property == FileProperty.SPDX_ID: return file.spdx_id elif file_property == FileProperty.ANNOTATIONS: diff --git a/src/spdx_tools/spdx/jsonschema/package_converter.py b/src/spdx_tools/spdx/jsonschema/package_converter.py index 074fc7a78..fc03ee473 100644 --- a/src/spdx_tools/spdx/jsonschema/package_converter.py +++ b/src/spdx_tools/spdx/jsonschema/package_converter.py @@ -33,7 +33,7 @@ def json_property_name(self, package_property: PackageProperty) -> str: return super().json_property_name(package_property) def _get_property_value( - self, package: Package, package_property: PackageProperty, document: Document = None + self, package: Package, package_property: PackageProperty, document: Document | None = None ) -> Any: if package_property == PackageProperty.SPDX_ID: return package.spdx_id diff --git a/src/spdx_tools/spdx/jsonschema/package_verification_code_converter.py b/src/spdx_tools/spdx/jsonschema/package_verification_code_converter.py index b98396272..6ca08a55d 100644 --- a/src/spdx_tools/spdx/jsonschema/package_verification_code_converter.py +++ b/src/spdx_tools/spdx/jsonschema/package_verification_code_converter.py @@ -14,7 +14,7 @@ def _get_property_value( self, verification_code: PackageVerificationCode, verification_code_property: PackageVerificationCodeProperty, - document: Document = None, + document: Document | None = None, ) -> Any: if verification_code_property == PackageVerificationCodeProperty.PACKAGE_VERIFICATION_CODE_EXCLUDED_FILES: return verification_code.excluded_files or None diff --git a/src/spdx_tools/spdx/jsonschema/relationship_converter.py b/src/spdx_tools/spdx/jsonschema/relationship_converter.py index 78442d25b..05c7d6324 100644 --- a/src/spdx_tools/spdx/jsonschema/relationship_converter.py +++ b/src/spdx_tools/spdx/jsonschema/relationship_converter.py @@ -11,7 +11,7 @@ class RelationshipConverter(TypedConverter[Relationship]): def _get_property_value( - self, relationship: Relationship, relationship_property: RelationshipProperty, document: Document = None + self, relationship: Relationship, relationship_property: RelationshipProperty, document: Document | None = None ) -> Any: if relationship_property == RelationshipProperty.SPDX_ELEMENT_ID: return relationship.spdx_element_id diff --git a/src/spdx_tools/spdx/jsonschema/snippet_converter.py b/src/spdx_tools/spdx/jsonschema/snippet_converter.py index a4e75c4fa..8d880fe25 100644 --- a/src/spdx_tools/spdx/jsonschema/snippet_converter.py +++ b/src/spdx_tools/spdx/jsonschema/snippet_converter.py @@ -23,7 +23,7 @@ def json_property_name(self, snippet_property: SnippetProperty) -> str: return super().json_property_name(snippet_property) def _get_property_value( - self, snippet: Snippet, snippet_property: SnippetProperty, document: Document = None + self, snippet: Snippet, snippet_property: SnippetProperty, document: Document | None = None ) -> Any: if snippet_property == SnippetProperty.SPDX_ID: return snippet.spdx_id diff --git a/src/spdx_tools/spdx/model/document.py b/src/spdx_tools/spdx/model/document.py index 980c59ca5..2621f0867 100644 --- a/src/spdx_tools/spdx/model/document.py +++ b/src/spdx_tools/spdx/model/document.py @@ -45,7 +45,7 @@ def __init__( created: datetime, creator_comment: Optional[str] = None, data_license: str = "CC0-1.0", - external_document_refs: List[ExternalDocumentRef] = None, + external_document_refs: List[ExternalDocumentRef] | None = None, license_list_version: Optional[Version] = None, document_comment: Optional[str] = None, ): @@ -67,12 +67,12 @@ class Document: def __init__( self, creation_info: CreationInfo, - packages: List[Package] = None, - files: List[File] = None, - snippets: List[Snippet] = None, - annotations: List[Annotation] = None, - relationships: List[Relationship] = None, - extracted_licensing_info: List[ExtractedLicensingInfo] = None, + packages: List[Package] | None = None, + files: List[File] | None = None, + snippets: List[Snippet] | None = None, + annotations: List[Annotation] | None = None, + relationships: List[Relationship] | None = None, + extracted_licensing_info: List[ExtractedLicensingInfo] | None = None, ): packages = [] if packages is None else packages files = [] if files is None else files diff --git a/src/spdx_tools/spdx/model/extracted_licensing_info.py b/src/spdx_tools/spdx/model/extracted_licensing_info.py index e401dd7b6..046f0dd39 100644 --- a/src/spdx_tools/spdx/model/extracted_licensing_info.py +++ b/src/spdx_tools/spdx/model/extracted_licensing_info.py @@ -23,7 +23,7 @@ def __init__( license_id: Optional[str] = None, extracted_text: Optional[str] = None, license_name: Optional[Union[str, SpdxNoAssertion]] = None, - cross_references: List[str] = None, + cross_references: List[str] | None = None, comment: Optional[str] = None, ): cross_references = [] if cross_references is None else cross_references diff --git a/src/spdx_tools/spdx/model/file.py b/src/spdx_tools/spdx/model/file.py index 27aae4ca3..161e02ac8 100644 --- a/src/spdx_tools/spdx/model/file.py +++ b/src/spdx_tools/spdx/model/file.py @@ -51,15 +51,15 @@ def __init__( name: str, spdx_id: str, checksums: List[Checksum], - file_types: List[FileType] = None, + file_types: List[FileType] | None = None, license_concluded: Optional[Union[LicenseExpression, SpdxNoAssertion, SpdxNone]] = None, - license_info_in_file: List[Union[LicenseExpression, SpdxNoAssertion, SpdxNone]] = None, + license_info_in_file: List[Union[LicenseExpression, SpdxNoAssertion, SpdxNone]] | None = None, license_comment: Optional[str] = None, copyright_text: Optional[Union[str, SpdxNoAssertion, SpdxNone]] = None, - comment: str = None, + comment: str | None = None, notice: Optional[str] = None, - contributors: List[str] = None, - attribution_texts: List[str] = None, + contributors: List[str] | None = None, + attribution_texts: List[str] | None = None, ): file_types = [] if file_types is None else file_types license_info_in_file = [] if license_info_in_file is None else license_info_in_file diff --git a/src/spdx_tools/spdx/model/package.py b/src/spdx_tools/spdx/model/package.py index 1cf89e607..6fdfa7103 100644 --- a/src/spdx_tools/spdx/model/package.py +++ b/src/spdx_tools/spdx/model/package.py @@ -33,7 +33,7 @@ class PackageVerificationCode: value: str excluded_files: List[str] = field(default_factory=list) - def __init__(self, value: str, excluded_files: List[str] = None): + def __init__(self, value: str, excluded_files: List[str] | None = None): excluded_files = [] if excluded_files is None else excluded_files check_types_and_set_values(self, locals()) @@ -109,19 +109,19 @@ def __init__( originator: Optional[Union[Actor, SpdxNoAssertion]] = None, files_analyzed: bool = True, verification_code: Optional[PackageVerificationCode] = None, - checksums: List[Checksum] = None, + checksums: List[Checksum] | None = None, homepage: Optional[Union[str, SpdxNoAssertion, SpdxNone]] = None, source_info: Optional[str] = None, license_concluded: Optional[Union[LicenseExpression, SpdxNoAssertion, SpdxNone]] = None, - license_info_from_files: List[Union[LicenseExpression, SpdxNoAssertion, SpdxNone]] = None, + license_info_from_files: List[Union[LicenseExpression, SpdxNoAssertion, SpdxNone]] | None = None, license_declared: Optional[Union[LicenseExpression, SpdxNoAssertion, SpdxNone]] = None, license_comment: Optional[str] = None, copyright_text: Optional[Union[str, SpdxNoAssertion, SpdxNone]] = None, summary: Optional[str] = None, description: Optional[str] = None, comment: Optional[str] = None, - external_references: List[ExternalPackageRef] = None, - attribution_texts: List[str] = None, + external_references: List[ExternalPackageRef] | None = None, + attribution_texts: List[str] | None = None, primary_package_purpose: Optional[PackagePurpose] = None, release_date: Optional[datetime] = None, built_date: Optional[datetime] = None, diff --git a/src/spdx_tools/spdx/model/snippet.py b/src/spdx_tools/spdx/model/snippet.py index 5a1669f4a..331ea41fb 100644 --- a/src/spdx_tools/spdx/model/snippet.py +++ b/src/spdx_tools/spdx/model/snippet.py @@ -32,12 +32,12 @@ def __init__( byte_range: Tuple[int, int], line_range: Optional[Tuple[int, int]] = None, license_concluded: Optional[Union[LicenseExpression, SpdxNoAssertion, SpdxNone]] = None, - license_info_in_snippet: List[Union[LicenseExpression, SpdxNoAssertion, SpdxNone]] = None, + license_info_in_snippet: List[Union[LicenseExpression, SpdxNoAssertion, SpdxNone]] | None = None, license_comment: Optional[str] = None, copyright_text: Optional[Union[str, SpdxNoAssertion, SpdxNone]] = None, comment: Optional[str] = None, name: Optional[str] = None, - attribution_texts: List[str] = None, + attribution_texts: List[str] | None = None, ): attribution_texts = [] if attribution_texts is None else attribution_texts license_info_in_snippet = [] if license_info_in_snippet is None else license_info_in_snippet diff --git a/src/spdx_tools/spdx/parser/jsonlikedict/dict_parsing_functions.py b/src/spdx_tools/spdx/parser/jsonlikedict/dict_parsing_functions.py index 0733317d1..731f39362 100644 --- a/src/spdx_tools/spdx/parser/jsonlikedict/dict_parsing_functions.py +++ b/src/spdx_tools/spdx/parser/jsonlikedict/dict_parsing_functions.py @@ -19,7 +19,7 @@ def parse_field_or_log_error( logger: Logger, field: Any, parsing_method: Callable = lambda x: x, - default: Any = None, + default: Any | None = None, field_is_list: bool = False, ) -> Any: if not field: diff --git a/src/spdx_tools/spdx/parser/parsing_functions.py b/src/spdx_tools/spdx/parser/parsing_functions.py index 47f73951d..c58a54322 100644 --- a/src/spdx_tools/spdx/parser/parsing_functions.py +++ b/src/spdx_tools/spdx/parser/parsing_functions.py @@ -18,7 +18,7 @@ def construct_or_raise_parsing_error(object_to_construct: Any, args_for_construc return constructed_object -def raise_parsing_error_if_logger_has_messages(logger: Logger, parsed_object_name: str = None): +def raise_parsing_error_if_logger_has_messages(logger: Logger, parsed_object_name: str | None = None): if logger.has_messages(): if parsed_object_name: raise SPDXParsingError([f"Error while parsing {parsed_object_name}: {logger.get_messages()}"]) diff --git a/src/spdx_tools/spdx/parser/rdf/graph_parsing_functions.py b/src/spdx_tools/spdx/parser/rdf/graph_parsing_functions.py index 5e2b8e099..096a457c6 100644 --- a/src/spdx_tools/spdx/parser/rdf/graph_parsing_functions.py +++ b/src/spdx_tools/spdx/parser/rdf/graph_parsing_functions.py @@ -24,7 +24,7 @@ def parse_literal( subject: Node, predicate: Node, parsing_method: Callable = lambda x: x.strip(), - default: Any = None, + default: Any | None = None, ): value = get_unique_value(logger, graph, subject, predicate, default) if not value: @@ -33,7 +33,7 @@ def parse_literal( def apply_parsing_method_or_log_error( - logger: Logger, value: Any, parsing_method: Callable = lambda x: x.strip(), default: Any = None + logger: Logger, value: Any, parsing_method: Callable = lambda x: x.strip(), default: Any | None = None ): try: return parsing_method(value) @@ -50,14 +50,14 @@ def parse_literal_or_no_assertion_or_none( subject: Node, predicate: Node, parsing_method: Callable = lambda x: x.strip(), - default: Any = None, + default: Any | None = None, ): value = get_unique_value(logger, graph, subject, predicate, default) return get_correctly_typed_value(logger, value, parsing_method, default) def get_correctly_typed_value( - logger: Logger, value: Any, parsing_method: Callable = lambda x: x.strip(), default: Any = None + logger: Logger, value: Any, parsing_method: Callable = lambda x: x.strip(), default: Any | None = None ): if not value: return default diff --git a/src/spdx_tools/spdx/validation/document_validator.py b/src/spdx_tools/spdx/validation/document_validator.py index b6fba74b8..71fe59120 100644 --- a/src/spdx_tools/spdx/validation/document_validator.py +++ b/src/spdx_tools/spdx/validation/document_validator.py @@ -16,7 +16,7 @@ from spdx_tools.spdx.validation.validation_message import SpdxElementType, ValidationContext, ValidationMessage -def validate_full_spdx_document(document: Document, spdx_version: str = None) -> List[ValidationMessage]: +def validate_full_spdx_document(document: Document, spdx_version: str | None = None) -> List[ValidationMessage]: validation_messages: List[ValidationMessage] = [] # SPDX version validation has to happen here because subsequent validators rely on it diff --git a/src/spdx_tools/spdx/validation/license_expression_validator.py b/src/spdx_tools/spdx/validation/license_expression_validator.py index e463aa9b6..26ba22510 100644 --- a/src/spdx_tools/spdx/validation/license_expression_validator.py +++ b/src/spdx_tools/spdx/validation/license_expression_validator.py @@ -29,7 +29,7 @@ def validate_license_expression( license_expression: Optional[Union[LicenseExpression, SpdxNoAssertion, SpdxNone]], document: Document, parent_id: str, - context: ValidationContext = None, + context: ValidationContext | None = None, ) -> List[ValidationMessage]: if license_expression in [SpdxNoAssertion(), SpdxNone(), None]: return [] diff --git a/src/spdx_tools/spdx/writer/json/json_writer.py b/src/spdx_tools/spdx/writer/json/json_writer.py index bdcfdf718..0f8a07f98 100644 --- a/src/spdx_tools/spdx/writer/json/json_writer.py +++ b/src/spdx_tools/spdx/writer/json/json_writer.py @@ -14,7 +14,7 @@ def write_document_to_stream( document: Document, stream: IO[str], validate: bool = True, - converter: DocumentConverter = None, + converter: DocumentConverter | None = None, drop_duplicates: bool = True, ): """ @@ -31,7 +31,7 @@ def write_document_to_file( document: Document, file_name: str, validate: bool = True, - converter: DocumentConverter = None, + converter: DocumentConverter | None = None, drop_duplicates: bool = True, ): with open(file_name, "w", encoding="utf-8") as out: diff --git a/src/spdx_tools/spdx/writer/xml/xml_writer.py b/src/spdx_tools/spdx/writer/xml/xml_writer.py index 9be152928..0c38d5877 100644 --- a/src/spdx_tools/spdx/writer/xml/xml_writer.py +++ b/src/spdx_tools/spdx/writer/xml/xml_writer.py @@ -13,7 +13,7 @@ def write_document_to_stream( document: Document, stream: IO[str], validate: bool = True, - converter: DocumentConverter = None, + converter: DocumentConverter | None = None, drop_duplicates: bool = True, ): """ @@ -30,7 +30,7 @@ def write_document_to_file( document: Document, file_name: str, validate: bool = True, - converter: DocumentConverter = None, + converter: DocumentConverter | None = None, drop_duplicates: bool = True, ): with open(file_name, "w", encoding="utf-8") as out: diff --git a/src/spdx_tools/spdx/writer/yaml/yaml_writer.py b/src/spdx_tools/spdx/writer/yaml/yaml_writer.py index b3e105dc6..33fb05cb0 100644 --- a/src/spdx_tools/spdx/writer/yaml/yaml_writer.py +++ b/src/spdx_tools/spdx/writer/yaml/yaml_writer.py @@ -13,7 +13,7 @@ def write_document_to_stream( document: Document, stream: IO[str], validate: bool = True, - converter: DocumentConverter = None, + converter: DocumentConverter | None = None, drop_duplicates: bool = True, ): """ @@ -30,7 +30,7 @@ def write_document_to_file( document: Document, file_name: str, validate: bool = True, - converter: DocumentConverter = None, + converter: DocumentConverter | None = None, drop_duplicates: bool = True, ): with open(file_name, "w", encoding="utf-8") as out: diff --git a/src/spdx_tools/spdx3/model/agent.py b/src/spdx_tools/spdx3/model/agent.py index 9aa326e22..14db2a52e 100644 --- a/src/spdx_tools/spdx3/model/agent.py +++ b/src/spdx_tools/spdx3/model/agent.py @@ -18,9 +18,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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, ): verified_using = [] if verified_using is None else verified_using diff --git a/src/spdx_tools/spdx3/model/ai/ai_package.py b/src/spdx_tools/spdx3/model/ai/ai_package.py index b297385e3..f08907352 100644 --- a/src/spdx_tools/spdx3/model/ai/ai_package.py +++ b/src/spdx_tools/spdx3/model/ai/ai_package.py @@ -52,16 +52,16 @@ 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, - originated_by: List[str] = None, + originated_by: List[str] | None = None, built_time: Optional[datetime] = None, valid_until_time: Optional[datetime] = None, - standard: List[str] = None, + standard: List[str] | None = None, content_identifier: Optional[str] = None, - additional_purpose: List[SoftwarePurpose] = None, + additional_purpose: List[SoftwarePurpose] | None = None, concluded_license: Optional[LicenseField] = None, declared_license: Optional[LicenseField] = None, copyright_text: Optional[str] = None, @@ -70,18 +70,18 @@ def __init__( homepage: Optional[str] = None, source_info: Optional[str] = None, energy_consumption: Optional[str] = None, - standard_compliance: List[str] = None, + standard_compliance: List[str] | None = None, limitation: Optional[str] = None, - type_of_model: List[str] = None, + type_of_model: List[str] | None = None, information_about_training: Optional[str] = None, information_about_application: Optional[str] = None, - hyperparameter: Dict[str, Optional[str]] = None, - model_data_preprocessing: List[str] = None, - model_explainability: List[str] = None, + hyperparameter: Dict[str, Optional[str]] | None = None, + model_data_preprocessing: List[str] | None = None, + model_explainability: List[str] | None = None, sensitive_personal_information: Optional[bool] = None, - metric_decision_threshold: Dict[str, Optional[str]] = None, - metric: Dict[str, Optional[str]] = None, - domain: List[str] = None, + metric_decision_threshold: Dict[str, Optional[str]] | None = None, + metric: Dict[str, Optional[str]] | None = None, + domain: List[str] | None = None, autonomy_type: Optional[bool] = None, safety_risk_assessment: Optional[SafetyRiskAssessmentType] = None, ): diff --git a/src/spdx_tools/spdx3/model/annotation.py b/src/spdx_tools/spdx3/model/annotation.py index e74d9d578..e9fa6a7a0 100644 --- a/src/spdx_tools/spdx3/model/annotation.py +++ b/src/spdx_tools/spdx3/model/annotation.py @@ -33,11 +33,11 @@ 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, - content_type: List[str] = None, + content_type: List[str] | None = None, statement: Optional[str] = None, ): verified_using = [] if verified_using is None else verified_using diff --git a/src/spdx_tools/spdx3/model/bom.py b/src/spdx_tools/spdx3/model/bom.py index a9ad7d57e..bf9b874a1 100644 --- a/src/spdx_tools/spdx3/model/bom.py +++ b/src/spdx_tools/spdx3/model/bom.py @@ -31,12 +31,12 @@ 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, - namespaces: List[NamespaceMap] = None, - imports: List[ExternalMap] = None, + namespaces: List[NamespaceMap] | None = None, + imports: List[ExternalMap] | None = None, context: Optional[str] = None, ): verified_using = [] if verified_using is None else verified_using diff --git a/src/spdx_tools/spdx3/model/build/build.py b/src/spdx_tools/spdx3/model/build/build.py index c6662ccce..37583371e 100644 --- a/src/spdx_tools/spdx3/model/build/build.py +++ b/src/spdx_tools/spdx3/model/build/build.py @@ -32,18 +32,18 @@ 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, build_id: Optional[str] = None, - config_source_entrypoint: List[str] = None, - config_source_uri: List[str] = None, - config_source_digest: List[Hash] = None, - parameters: Dict[str, str] = None, + config_source_entrypoint: List[str] | None = None, + config_source_uri: List[str] | None = None, + config_source_digest: List[Hash] | None = None, + parameters: Dict[str, str] | None = None, build_start_time: Optional[datetime] = None, build_end_time: Optional[datetime] = None, - environment: Dict[str, str] = None, + environment: Dict[str, str] | None = None, ): verified_using = [] if verified_using is None else verified_using external_reference = [] if external_reference is None else external_reference diff --git a/src/spdx_tools/spdx3/model/bundle.py b/src/spdx_tools/spdx3/model/bundle.py index 63640f845..88079a19c 100644 --- a/src/spdx_tools/spdx3/model/bundle.py +++ b/src/spdx_tools/spdx3/model/bundle.py @@ -30,12 +30,12 @@ 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, - namespaces: List[NamespaceMap] = None, - imports: List[ExternalMap] = None, + namespaces: List[NamespaceMap] | None = None, + imports: List[ExternalMap] | None = None, context: Optional[str] = None, ): verified_using = [] if verified_using is None else verified_using diff --git a/src/spdx_tools/spdx3/model/creation_info.py b/src/spdx_tools/spdx3/model/creation_info.py index 125d4d30d..cbb75d0bc 100644 --- a/src/spdx_tools/spdx3/model/creation_info.py +++ b/src/spdx_tools/spdx3/model/creation_info.py @@ -29,7 +29,7 @@ def __init__( created_by: List[str], profile: List[ProfileIdentifierType], data_license: Optional[str] = "CC0-1.0", - created_using: List[str] = None, + created_using: List[str] | None = None, comment: Optional[str] = None, ): created_using = [] if created_using is None else created_using diff --git a/src/spdx_tools/spdx3/model/dataset/dataset.py b/src/spdx_tools/spdx3/model/dataset/dataset.py index bbb82cc3a..c5fff28cd 100644 --- a/src/spdx_tools/spdx3/model/dataset/dataset.py +++ b/src/spdx_tools/spdx3/model/dataset/dataset.py @@ -76,15 +76,15 @@ 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, - supplied_by: List[str] = None, + supplied_by: List[str] | None = None, valid_until_time: Optional[datetime] = None, - standard: List[str] = None, + standard: List[str] | None = None, content_identifier: Optional[str] = None, - additional_purpose: List[SoftwarePurpose] = None, + additional_purpose: List[SoftwarePurpose] | None = None, concluded_license: Optional[LicenseField] = None, declared_license: Optional[LicenseField] = None, copyright_text: Optional[str] = None, @@ -97,11 +97,11 @@ def __init__( intended_use: Optional[str] = None, dataset_size: Optional[int] = None, dataset_noise: Optional[str] = None, - data_preprocessing: List[str] = None, - sensor: Dict[str, Optional[str]] = None, - known_bias: List[str] = None, + data_preprocessing: List[str] | None = None, + sensor: Dict[str, Optional[str]] | None = None, + known_bias: List[str] | None = None, sensitive_personal_information: Optional[bool] = None, - anonymization_method_used: List[str] = None, + anonymization_method_used: List[str] | None = None, confidentiality_level: Optional[ConfidentialityLevelType] = None, dataset_update_mechanism: Optional[str] = None, dataset_availability: Optional[DatasetAvailabilityType] = None, diff --git a/src/spdx_tools/spdx3/model/external_identifier.py b/src/spdx_tools/spdx3/model/external_identifier.py index ee458151e..772c1df0a 100644 --- a/src/spdx_tools/spdx3/model/external_identifier.py +++ b/src/spdx_tools/spdx3/model/external_identifier.py @@ -37,7 +37,7 @@ def __init__( external_identifier_type: ExternalIdentifierType, identifier: str, comment: Optional[str] = None, - identifier_locator: List[str] = None, + identifier_locator: List[str] | None = None, issuing_authority: Optional[str] = None, ): identifier_locator = [] if identifier_locator is None else identifier_locator diff --git a/src/spdx_tools/spdx3/model/external_map.py b/src/spdx_tools/spdx3/model/external_map.py index ab88a49e2..01fcd7ebc 100644 --- a/src/spdx_tools/spdx3/model/external_map.py +++ b/src/spdx_tools/spdx3/model/external_map.py @@ -20,7 +20,7 @@ class ExternalMap: def __init__( self, external_id: str, - verified_using: List[IntegrityMethod] = None, + verified_using: List[IntegrityMethod] | None = None, location_hint: Optional[str] = None, defining_document: Optional[str] = None, ): diff --git a/src/spdx_tools/spdx3/model/external_reference.py b/src/spdx_tools/spdx3/model/external_reference.py index 2f44a54d6..64e5bdb97 100644 --- a/src/spdx_tools/spdx3/model/external_reference.py +++ b/src/spdx_tools/spdx3/model/external_reference.py @@ -61,7 +61,7 @@ class ExternalReference: def __init__( self, external_reference_type: Optional[ExternalReferenceType] = None, - locator: List[str] = None, + locator: List[str] | None = None, content_type: Optional[str] = None, comment: Optional[str] = None, ): diff --git a/src/spdx_tools/spdx3/model/licensing/custom_license.py b/src/spdx_tools/spdx3/model/licensing/custom_license.py index 4617a18db..608f7e69a 100644 --- a/src/spdx_tools/spdx3/model/licensing/custom_license.py +++ b/src/spdx_tools/spdx3/model/licensing/custom_license.py @@ -16,7 +16,7 @@ def __init__( license_name: str, license_text: str, license_comment: Optional[str] = None, - see_also: List[str] = None, + see_also: List[str] | None = None, is_osi_approved: Optional[bool] = None, is_fsf_libre: Optional[bool] = None, standard_license_header: Optional[str] = None, diff --git a/src/spdx_tools/spdx3/model/licensing/custom_license_addition.py b/src/spdx_tools/spdx3/model/licensing/custom_license_addition.py index b50d27770..5d4ee8929 100644 --- a/src/spdx_tools/spdx3/model/licensing/custom_license_addition.py +++ b/src/spdx_tools/spdx3/model/licensing/custom_license_addition.py @@ -16,7 +16,7 @@ def __init__( addition_name: str, addition_text: str, addition_comment: Optional[str] = None, - see_also: List[str] = None, + see_also: List[str] | None = None, standard_addition_template: Optional[str] = None, is_deprecated_addition_id: Optional[bool] = None, obsoleted_by: Optional[str] = None, diff --git a/src/spdx_tools/spdx3/model/licensing/listed_license.py b/src/spdx_tools/spdx3/model/licensing/listed_license.py index 2c0b02b3d..104396dbc 100644 --- a/src/spdx_tools/spdx3/model/licensing/listed_license.py +++ b/src/spdx_tools/spdx3/model/licensing/listed_license.py @@ -19,7 +19,7 @@ def __init__( license_name: str, license_text: str, license_comment: Optional[str] = None, - see_also: List[str] = None, + see_also: List[str] | None = None, is_osi_approved: Optional[bool] = None, is_fsf_libre: Optional[bool] = None, standard_license_header: Optional[str] = None, diff --git a/src/spdx_tools/spdx3/model/licensing/listed_license_exception.py b/src/spdx_tools/spdx3/model/licensing/listed_license_exception.py index 799fcedae..2264f474f 100644 --- a/src/spdx_tools/spdx3/model/licensing/listed_license_exception.py +++ b/src/spdx_tools/spdx3/model/licensing/listed_license_exception.py @@ -19,7 +19,7 @@ def __init__( addition_name: str, addition_text: str, addition_comment: Optional[str] = None, - see_also: List[str] = None, + see_also: List[str] | None = None, standard_addition_template: Optional[str] = None, is_deprecated_addition_id: Optional[bool] = None, obsoleted_by: Optional[str] = None, diff --git a/src/spdx_tools/spdx3/model/lifecycle_scoped_relationship.py b/src/spdx_tools/spdx3/model/lifecycle_scoped_relationship.py index a06e108ce..660e1217e 100644 --- a/src/spdx_tools/spdx3/model/lifecycle_scoped_relationship.py +++ b/src/spdx_tools/spdx3/model/lifecycle_scoped_relationship.py @@ -37,15 +37,15 @@ def __init__( spdx_id: str, from_element: str, relationship_type: RelationshipType, - to: List[str] = None, + to: List[str] | None = None, creation_info: Optional[CreationInfo] = None, name: Optional[str] = None, 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, completeness: Optional[RelationshipCompleteness] = None, start_time: Optional[datetime] = None, diff --git a/src/spdx_tools/spdx3/model/organization.py b/src/spdx_tools/spdx3/model/organization.py index c297b24b3..fdc71e594 100644 --- a/src/spdx_tools/spdx3/model/organization.py +++ b/src/spdx_tools/spdx3/model/organization.py @@ -18,9 +18,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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, ): verified_using = [] if verified_using is None else verified_using diff --git a/src/spdx_tools/spdx3/model/person.py b/src/spdx_tools/spdx3/model/person.py index 782e5a366..dc9bd6c42 100644 --- a/src/spdx_tools/spdx3/model/person.py +++ b/src/spdx_tools/spdx3/model/person.py @@ -18,9 +18,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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, ): verified_using = [] if verified_using is None else verified_using diff --git a/src/spdx_tools/spdx3/model/relationship.py b/src/spdx_tools/spdx3/model/relationship.py index 873559460..28ba527ce 100644 --- a/src/spdx_tools/spdx3/model/relationship.py +++ b/src/spdx_tools/spdx3/model/relationship.py @@ -99,15 +99,15 @@ def __init__( spdx_id: str, from_element: str, relationship_type: RelationshipType, - to: List[str] = None, + to: List[str] | None = None, creation_info: Optional[CreationInfo] = None, name: Optional[str] = None, 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, completeness: Optional[RelationshipCompleteness] = None, start_time: Optional[datetime] = None, 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 index c686f9dfc..13366cb63 100644 --- 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 @@ -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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, completeness: Optional[RelationshipCompleteness] = None, start_time: Optional[datetime] = None, 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 index ab8a803af..62a50805e 100644 --- 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, completeness: Optional[RelationshipCompleteness] = None, start_time: Optional[datetime] = None, 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 index f5001a92d..261601456 100644 --- 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, completeness: Optional[RelationshipCompleteness] = None, start_time: Optional[datetime] = None, 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 index a7a67ac68..27608ad24 100644 --- 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, completeness: Optional[RelationshipCompleteness] = None, start_time: Optional[datetime] = None, 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 index d98803874..d2f52f69e 100644 --- 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, completeness: Optional[RelationshipCompleteness] = None, start_time: Optional[datetime] = None, 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 index 2dc242273..f42da97ae 100644 --- 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, completeness: Optional[RelationshipCompleteness] = None, start_time: Optional[datetime] = None, @@ -50,7 +50,7 @@ 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] | None = None, ): verified_using = [] if verified_using is None else verified_using external_reference = [] if external_reference is None else external_reference 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 index c8bdc2b38..976c81bbc 100644 --- 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, completeness: Optional[RelationshipCompleteness] = None, start_time: Optional[datetime] = None, diff --git a/src/spdx_tools/spdx3/model/security/vex_not_affected_vuln_assessment_relationship.py b/src/spdx_tools/spdx3/model/security/vex_not_affected_vuln_assessment_relationship.py index 4c019a973..5fa1e05a8 100644 --- a/src/spdx_tools/spdx3/model/security/vex_not_affected_vuln_assessment_relationship.py +++ b/src/spdx_tools/spdx3/model/security/vex_not_affected_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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, completeness: Optional[RelationshipCompleteness] = None, start_time: Optional[datetime] = None, diff --git a/src/spdx_tools/spdx3/model/security/vex_under_investigation_vuln_assessment_relationship.py b/src/spdx_tools/spdx3/model/security/vex_under_investigation_vuln_assessment_relationship.py index ba63480bc..66a5f2fe1 100644 --- a/src/spdx_tools/spdx3/model/security/vex_under_investigation_vuln_assessment_relationship.py +++ b/src/spdx_tools/spdx3/model/security/vex_under_investigation_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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, completeness: Optional[RelationshipCompleteness] = None, start_time: Optional[datetime] = None, diff --git a/src/spdx_tools/spdx3/model/security/vulnerability.py b/src/spdx_tools/spdx3/model/security/vulnerability.py index a137b1cb7..6f5db8522 100644 --- a/src/spdx_tools/spdx3/model/security/vulnerability.py +++ b/src/spdx_tools/spdx3/model/security/vulnerability.py @@ -24,9 +24,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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, published_time: Optional[datetime] = None, modified_time: Optional[datetime] = None, diff --git a/src/spdx_tools/spdx3/model/software/file.py b/src/spdx_tools/spdx3/model/software/file.py index c962b4dbd..f4b170345 100644 --- a/src/spdx_tools/spdx3/model/software/file.py +++ b/src/spdx_tools/spdx3/model/software/file.py @@ -25,19 +25,19 @@ 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, - originated_by: List[str] = None, - supplied_by: List[str] = None, + originated_by: List[str] | None = None, + supplied_by: List[str] | None = None, built_time: Optional[datetime] = None, release_time: Optional[datetime] = None, valid_until_time: Optional[datetime] = None, - standard: List[str] = None, + standard: List[str] | None = None, content_identifier: Optional[str] = None, primary_purpose: Optional[SoftwarePurpose] = None, - additional_purpose: List[SoftwarePurpose] = None, + additional_purpose: List[SoftwarePurpose] | None = None, concluded_license: Optional[LicenseField] = None, declared_license: Optional[LicenseField] = None, copyright_text: Optional[str] = None, diff --git a/src/spdx_tools/spdx3/model/software/package.py b/src/spdx_tools/spdx3/model/software/package.py index 0c249cc1b..12e3eefa0 100644 --- a/src/spdx_tools/spdx3/model/software/package.py +++ b/src/spdx_tools/spdx3/model/software/package.py @@ -29,19 +29,19 @@ 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, - originated_by: List[str] = None, - supplied_by: List[str] = None, + originated_by: List[str] | None = None, + supplied_by: List[str] | None = None, built_time: Optional[datetime] = None, release_time: Optional[datetime] = None, valid_until_time: Optional[datetime] = None, - standard: List[str] = None, + standard: List[str] | None = None, content_identifier: Optional[str] = None, primary_purpose: Optional[SoftwarePurpose] = None, - additional_purpose: List[SoftwarePurpose] = None, + additional_purpose: List[SoftwarePurpose] | None = None, concluded_license: Optional[LicenseField] = None, declared_license: Optional[LicenseField] = None, copyright_text: Optional[str] = None, diff --git a/src/spdx_tools/spdx3/model/software/sbom.py b/src/spdx_tools/spdx3/model/software/sbom.py index 1fb06f615..951322e91 100644 --- a/src/spdx_tools/spdx3/model/software/sbom.py +++ b/src/spdx_tools/spdx3/model/software/sbom.py @@ -44,14 +44,14 @@ 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, - namespaces: List[NamespaceMap] = None, - imports: List[ExternalMap] = None, + namespaces: List[NamespaceMap] | None = None, + imports: List[ExternalMap] | None = None, context: Optional[str] = None, - sbom_type: List[SBOMType] = None, + sbom_type: List[SBOMType] | None = None, ): verified_using = [] if verified_using is None else verified_using external_reference = [] if external_reference is None else external_reference diff --git a/src/spdx_tools/spdx3/model/software/snippet.py b/src/spdx_tools/spdx3/model/software/snippet.py index b3ab61396..8cb7a771d 100644 --- a/src/spdx_tools/spdx3/model/software/snippet.py +++ b/src/spdx_tools/spdx3/model/software/snippet.py @@ -27,19 +27,19 @@ 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, - originated_by: List[str] = None, - supplied_by: List[str] = None, + originated_by: List[str] | None = None, + supplied_by: List[str] | None = None, built_time: Optional[datetime] = None, release_time: Optional[datetime] = None, valid_until_time: Optional[datetime] = None, - standard: List[str] = None, + standard: List[str] | None = None, content_identifier: Optional[str] = None, primary_purpose: Optional[SoftwarePurpose] = None, - additional_purpose: List[SoftwarePurpose] = None, + additional_purpose: List[SoftwarePurpose] | None = None, concluded_license: Optional[LicenseField] = None, declared_license: Optional[LicenseField] = None, copyright_text: Optional[str] = None, diff --git a/src/spdx_tools/spdx3/model/software/software_dependency_relationship.py b/src/spdx_tools/spdx3/model/software/software_dependency_relationship.py index c6751ecaa..37c48a610 100644 --- a/src/spdx_tools/spdx3/model/software/software_dependency_relationship.py +++ b/src/spdx_tools/spdx3/model/software/software_dependency_relationship.py @@ -45,15 +45,15 @@ def __init__( spdx_id: str, from_element: str, relationship_type: RelationshipType, - to: List[str] = None, + to: List[str] | None = None, creation_info: Optional[CreationInfo] = None, name: Optional[str] = None, 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, completeness: Optional[RelationshipCompleteness] = None, start_time: Optional[datetime] = None, diff --git a/src/spdx_tools/spdx3/model/software_agent.py b/src/spdx_tools/spdx3/model/software_agent.py index 28e4b33a2..158928926 100644 --- a/src/spdx_tools/spdx3/model/software_agent.py +++ b/src/spdx_tools/spdx3/model/software_agent.py @@ -18,9 +18,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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, ): verified_using = [] if verified_using is None else verified_using diff --git a/src/spdx_tools/spdx3/model/spdx_document.py b/src/spdx_tools/spdx3/model/spdx_document.py index d9c70401c..95aee5a40 100644 --- a/src/spdx_tools/spdx3/model/spdx_document.py +++ b/src/spdx_tools/spdx3/model/spdx_document.py @@ -31,12 +31,12 @@ 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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, - namespaces: List[NamespaceMap] = None, - imports: List[ExternalMap] = None, + namespaces: List[NamespaceMap] | None = None, + imports: List[ExternalMap] | None = None, context: Optional[str] = None, ): verified_using = [] if verified_using is None else verified_using diff --git a/src/spdx_tools/spdx3/model/tool.py b/src/spdx_tools/spdx3/model/tool.py index b4ba72cf3..8742c393a 100644 --- a/src/spdx_tools/spdx3/model/tool.py +++ b/src/spdx_tools/spdx3/model/tool.py @@ -18,9 +18,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] | None = None, + external_reference: List[ExternalReference] | None = None, + external_identifier: List[ExternalIdentifier] | None = None, extension: Optional[str] = None, ): verified_using = [] if verified_using is None else verified_using diff --git a/src/spdx_tools/spdx3/payload.py b/src/spdx_tools/spdx3/payload.py index 17bc78c91..d1108cf25 100644 --- a/src/spdx_tools/spdx3/payload.py +++ b/src/spdx_tools/spdx3/payload.py @@ -9,7 +9,7 @@ class Payload: _spdx_id_map: Dict[str, Element] - def __init__(self, spdx_id_map: Dict[str, Element] = None): + def __init__(self, spdx_id_map: Dict[str, Element] | None = None): self._spdx_id_map = spdx_id_map if spdx_id_map else {} def add_element(self, element: Element):