type hint: Make Optional explicit (PEP 484)

PEP 484 prohibits implicit Optional.

Note that this mass conversion is done automatically by https://github.com/hauntsaninja/no_implicit_optional as suggested by mypy, with a human review.

Uses `... | None` style instead of `Optional[...]` since we are now using Python 3.10.

Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>

Author: bact

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,7 @@ 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