type hint: Make Optional explicit (PEP 484)

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)

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)

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 "

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)

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

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

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

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

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:

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

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

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

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

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

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

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

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,

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

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:

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()}"])

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

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

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 []

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:

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:

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:

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