resolve comment

Author: lau-yeexuan

generated/nidaqmx/_time.py

@@ -23,6 +23,8 @@ def _convert_to_desired_timezone(
     if isinstance(tzinfo, ZoneInfo):
         localized_time = expected_time_utc.replace(tzinfo=tzinfo)
         std_datetime_result = tzinfo.fromutc(localized_time)
+        femtosecond = getattr(expected_time_utc, "femtosecond", 0)
+        yoctosecond = getattr(expected_time_utc, "yoctosecond", 0)
         desired_expected_time = ht_datetime(
             std_datetime_result.year,
             std_datetime_result.month,
@@ -31,10 +33,12 @@ def _convert_to_desired_timezone(
             std_datetime_result.minute,
             std_datetime_result.second,
             std_datetime_result.microsecond,
-            std_datetime_result.femtosecond,
-            tzinfo=std_datetime_result.tzinfo
+            femtosecond,
+            yoctosecond,
+            tzinfo=std_datetime_result.tzinfo,
+            fold=std_datetime_result.fold
         )
-        return desired_expected_time  
+        return desired_expected_time
 
     # if the tzinfo passed in is a timedelta function, then we don't need to consider daylight savings  # noqa: W505 - doc line too long (102 > 100 characters) (auto-generated noqa)
     elif tzinfo.utcoffset(None) is not None:

src/handwritten/_time.py

@@ -23,6 +23,8 @@ def _convert_to_desired_timezone(
     if isinstance(tzinfo, ZoneInfo):
         localized_time = expected_time_utc.replace(tzinfo=tzinfo)
         std_datetime_result = tzinfo.fromutc(localized_time)
+        femtosecond = getattr(expected_time_utc, "femtosecond", 0)
+        yoctosecond = getattr(expected_time_utc, "yoctosecond", 0)
         desired_expected_time = ht_datetime(
             std_datetime_result.year,
             std_datetime_result.month,
@@ -31,8 +33,10 @@ def _convert_to_desired_timezone(
             std_datetime_result.minute,
             std_datetime_result.second,
             std_datetime_result.microsecond,
-            std_datetime_result.femtosecond,
+            femtosecond,
+            yoctosecond,
             tzinfo=std_datetime_result.tzinfo,
+            fold=std_datetime_result.fold
         )
         return desired_expected_time
 

tests/unit/test_lib_time.py

@@ -118,7 +118,7 @@ def test___utc_datetime___convert_to_timestamp_with_dst___is_reversible(date):
         (ht_datetime(2023, 11, 5, tzinfo=timezone.utc), 1, 0x480F),
     ],
 )
-def test___datetime_with_dst_and_femtoseconds___convert_to_timestamp___is_reversible(
+def test___utc_datetime_with_femtoseconds___convert_to_timestamp_with_dst___is_reversible(
     base_dt, femtosecond, subseconds
 ):
     target_timezone = ZoneInfo("America/Los_Angeles")
@@ -130,12 +130,7 @@ def test___datetime_with_dst_and_femtoseconds___convert_to_timestamp___is_revers
 
     assert ts.msb == LibTimestamp.from_datetime(expected_la_time).msb
     assert ts.lsb == subseconds
-    # comparison is tricky since imprecision in the conversion to NI-BTF are
-    # caught by the higher precision values in hightime, so we round here.
-    roundtrip_dt_femtosecond = roundtrip_dt.femtosecond
-    if roundtrip_dt.yoctosecond > LibTimestamp.MAX_YS / 2:
-        roundtrip_dt_femtosecond += 1
-    assert roundtrip_dt_femtosecond == femtosecond
+    assert roundtrip_dt.femtosecond == expected_la_time.femtosecond    
 
 
 @pytest.mark.parametrize(