[issue-381] change error type of datetime_from_str()

Signed-off-by: Armin Tänzer <[email protected]>

Author: armintaenzertng

src/datetime_conversions.py

@@ -15,12 +15,9 @@
 
 def datetime_from_str(date_str: str) -> datetime:
     if not isinstance(date_str, str):
-        raise SPDXParsingError([f"Could not convert str to datetime, invalid type: {type(date_str).__name__}"])
-    try:
-        date = datetime.strptime(date_str, "%Y-%m-%dT%H:%M:%SZ")
-    except ValueError:
-        raise SPDXParsingError(
-            [f'Could not convert str to datetime, format of {date_str} does not match "%Y-%m-%dT%H:%M:%SZ"'])
+        raise TypeError(f"Could not convert str to datetime, invalid type: {type(date_str).__name__}")
+
+    date = datetime.strptime(date_str, "%Y-%m-%dT%H:%M:%SZ") # raises ValueError if format does not match
     return date
 
 def datetime_to_iso_string(date: datetime) -> str:

src/parser/json/dict_parsing_functions.py

@@ -42,7 +42,9 @@ def parse_field_or_log_error(logger: Logger, field: Any, parsing_method: Callabl
             return parsing_method(field)
     except SPDXParsingError as err:
         logger.extend(err.get_messages())
-        return default
+    except (TypeError, ValueError) as err:
+        logger.extend(err.args[0])
+    return default
 
 
 def append_parsed_field_or_log_error(logger: Logger, list_to_append_to: List[Any], field: Any,
@@ -52,6 +54,8 @@ def append_parsed_field_or_log_error(logger: Logger, list_to_append_to: List[Any
         list_to_append_to.append(parsed_element)
     except SPDXParsingError as err:
         logger.extend(err.get_messages())
+    except (TypeError, ValueError) as err:
+        logger.extend(err.args[0])
     return list_to_append_to
 
 

src/writer/tagvalue/creation_info_writer.py

@@ -37,8 +37,3 @@ def write_creation_info(creation_info: CreationInfo, text_output: TextIO):
         write_value("Creator", creator.to_serialized_string(), text_output)
     write_value("Created", datetime_to_iso_string(creation_info.created), text_output)
     write_text_value("CreatorComment", creation_info.creator_comment, text_output)
-
-
-
-
-

src/writer/tagvalue/extracted_licensing_info_writer.py

@@ -23,5 +23,3 @@ def write_extracted_licensing_info(extracted_licensing_info: ExtractedLicensingI
         write_value("LicenseCrossReference", cross_reference, text_output)
 
     write_text_value("LicenseComment", extracted_licensing_info.comment, text_output)
-
-

tests/parser/test_dict_parsing_functions.py

@@ -21,25 +21,6 @@
 from src.datetime_conversions import datetime_from_str
 
 
-def test_datetime_from_str():
-    date_str = "2010-03-04T05:45:11Z"
-
-    date = datetime_from_str(date_str)
-
-    assert date == datetime(2010, 3, 4, 5, 45, 11)
-
-
-@pytest.mark.parametrize("invalid_date_str,expected_message",
-                         [(5, ["Could not convert str to datetime, invalid type: int"]),
-                          ("2010-02-03", ['Could not convert str to datetime, format of 2010-02-03 does not match '
-                                          '"%Y-%m-%dT%H:%M:%SZ"'])])
-def test_datetime_from_str_error(invalid_date_str, expected_message):
-    with pytest.raises(SPDXParsingError) as err:
-        datetime_from_str(invalid_date_str)
-
-    TestCase().assertCountEqual(err.value.get_messages(), expected_message)
-
-
 def test_json_str_to_enum():
     json_str = "BLAKE2b-256"
 

tests/test_datetime_conversions.py

@@ -0,0 +1,31 @@
+#  Copyright (c) 2022 spdx contributors
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#      http://www.apache.org/licenses/LICENSE-2.0
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+from datetime import datetime
+
+import pytest
+
+from src.datetime_conversions import datetime_from_str
+
+
+def test_datetime_from_str():
+    date_str = "2010-03-04T05:45:11Z"
+
+    date = datetime_from_str(date_str)
+
+    assert date == datetime(2010, 3, 4, 5, 45, 11)
+
+
+@pytest.mark.parametrize("invalid_date_str, error_type, expected_message",
+                         [(5, TypeError, "Could not convert str to datetime, invalid type: int"),
+                          ("2010-02-03", ValueError, "time data '2010-02-03' does not match format '%Y-%m-%dT%H:%M:%SZ'")])
+def test_datetime_from_str_error(invalid_date_str, error_type, expected_message):
+    with pytest.raises(error_type, match=expected_message):
+        datetime_from_str(invalid_date_str)