adjust datetime parsing

Author: lukaspie

src/pynxtools_xps/value_mappers.py

@@ -160,7 +160,6 @@ def parse_datetime(
     all of which can be checked with this method.
     Optionally, a timezone (tzinfo) can be applied to the datetime object if provided.
 
-
     Parameters
     ----------
     datetime_string : str
@@ -179,18 +178,20 @@ def parse_datetime(
     Returns
     -------
     str
-        Datetime in ISO8601 format.
-
+        Datetime in ISO 8601 format.
     """
     for date_fmt in possible_date_formats:
         try:
             datetime_obj = datetime.datetime.strptime(datetime_string, date_fmt)
 
             if tzinfo is not None:
+                # Apply the specified timezone to the datetime object
                 datetime_obj = datetime_obj.replace(tzinfo=tzinfo)
 
-            return datetime_obj.astimezone().isoformat()
+            # Convert to ISO 8601 format
+            return datetime_obj.isoformat()
 
         except ValueError:
             continue
+
     raise ValueError("Date and time could not be converted to ISO 8601 format.")

tests/test_helpers.py

@@ -93,57 +93,57 @@ def test_extract_unit(
 
 
 @pytest.mark.parametrize(
-    "datetime_string, possible_date_formats, expected_iso8601, tzinfo",
+    "datetime_string, possible_date_formats, tzinfo, expected_iso8601",
     [
         # Test cases with valid datetime strings and formats
         (
             "2023-10-23 14:30:00",
             ["%Y-%m-%d %H:%M:%S"],
-            "2023-10-23T14:30:00+00:00",
             datetime.timezone.utc,
+            "2023-10-23T14:30:00+00:00",
         ),
         (
             "23/10/2023 14:30",
             ["%d/%m/%Y %H:%M"],
-            "2023-10-23T14:30:00+00:00",
             datetime.timezone.utc,
+            "2023-10-23T14:30:00+00:00",
         ),
         (
             "October 23, 2023 14:30",
             ["%B %d, %Y %H:%M"],
-            "2023-10-23T14:30:00+00:00",
             datetime.timezone.utc,
+            "2023-10-23T14:30:00+00:00",
         ),
         (
             "2023-10-23T14:30:00Z",
             ["%Y-%m-%dT%H:%M:%SZ"],
-            "2023-10-23T14:30:00+00:00",
             datetime.timezone.utc,
+            "2023-10-23T14:30:00+00:00",
         ),
         (
             "2023-10-23T14:30:00+0200",
             ["%Y-%m-%dT%H:%M:%S%z"],
-            "2023-10-23T14:30:00+02:00",
             datetime.timezone(datetime.timedelta(hours=2)),
+            "2023-10-23T14:30:00+02:00",
         ),
         # Test cases with timezone information
         (
             "2023-10-23 14:30:00",
             ["%Y-%m-%d %H:%M:%S"],
-            "2023-10-23T14:30:00+00:00",
             datetime.timezone(datetime.timedelta(hours=1)),
+            "2023-10-23T14:30:00+01:00",
         ),
         # Test case with missing timezone should still return UTC
         (
             "2023-10-23 14:30:00",
             ["%Y-%m-%d %H:%M:%S"],
-            "2023-10-23T14:30:00+00:00",
             None,
+            "2023-10-23T14:30:00",
         ),
     ],
 )
 def test_parse_datetime(
-    datetime_string, possible_date_formats, expected_iso8601, tzinfo
+    datetime_string, possible_date_formats, tzinfo, expected_iso8601
 ):
     result = parse_datetime(datetime_string, possible_date_formats, tzinfo)
     assert result == expected_iso8601, f"Expected {expected_iso8601} but got {result}"