Merge pull request dtcooper#147 from roboes/update-datetime-module

dlenski · web-flow · commit d88bb6997138 · 2025-01-28T14:09:15.000-08:00
Update datetime module as datetime.datetime.utcfromtimestamp() is deprecated
diff --git a/fitparse/processors.py b/fitparse/processors.py
@@ -70,15 +70,15 @@ def process_type_bool(self, field_data):
     def process_type_date_time(self, field_data):
         value = field_data.value
         if value is not None and value >= 0x10000000:
-            field_data.value = datetime.datetime.utcfromtimestamp(UTC_REFERENCE + value)
+            field_data.value = datetime.datetime.fromtimestamp(timestamp=(UTC_REFERENCE + value), tz=datetime.timezone.utc).replace(tzinfo=None)
             field_data.units = None  # Units were 's', set to None
 
     def process_type_local_date_time(self, field_data):
         if field_data.value is not None:
             # NOTE: This value was created on the device using it's local timezone.
             #       Unless we know that timezone, this value won't be correct. However, if we
             #       assume UTC, at least it'll be consistent.
-            field_data.value = datetime.datetime.utcfromtimestamp(UTC_REFERENCE + field_data.value)
+            field_data.value = datetime.datetime.fromtimestamp(timestamp=(UTC_REFERENCE + field_data.value), tz=datetime.timezone.utc).replace(tzinfo=None)
             field_data.units = None
 
     def process_type_localtime_into_day(self, field_data):
diff --git a/tests/test.py b/tests/test.py
@@ -66,7 +66,7 @@ def generate_fitfile(data=None, endian='<'):
 
 
 def secs_to_dt(secs):
-    return datetime.datetime.utcfromtimestamp(secs + UTC_REFERENCE)
+    return datetime.datetime.fromtimestamp(timestamp=(secs + UTC_REFERENCE), tz=datetime.timezone.utc).replace(tzinfo=None)
 
 
 def testfile(filename):
