Time-zone-aware date handling

NewareNDA/NewareNDA.py

@@ -7,7 +7,7 @@
 import struct
 import warnings
 import logging
-from datetime import datetime
+from datetime import datetime, timezone
 import pandas as pd
 
 from NewareNDA.dicts import rec_columns, aux_columns, dtype_dict, \
@@ -270,7 +270,7 @@ def _bytes_to_list_BTS9(bytes):
         Discharge_Capacity/3600,
         Charge_Energy/3600,
         Discharge_Energy/3600,
-        datetime.fromtimestamp(Date/1e6)
+        datetime.fromtimestamp(Date/1e6, timezone.utc).astimezone()
     ]
     return list
 

NewareNDA/NewareNDAx.py

@@ -9,7 +9,7 @@
 import tempfile
 import zipfile
 import re
-from datetime import datetime
+from datetime import datetime, timezone
 import xml.etree.ElementTree as ET
 import pandas as pd
 
@@ -207,7 +207,8 @@ def _read_data_runInfo_ndc(file):
                     rec.append([Time/1000,
                                 Charge_Capacity/3600, Discharge_Capacity/3600,
                                 Charge_Energy/3600, Discharge_Energy/3600,
-                                datetime.fromtimestamp(Timestamp), Step, Index])
+                                datetime.fromtimestamp(Timestamp, timezone.utc).astimezone(),
+                                Step, Index])
 
     # Create DataFrame
     df = pd.DataFrame(rec, columns=[

tests/test_NewareNDA.py

@@ -1,8 +1,14 @@
 import pandas as pd
 import NewareNDA
+from datetime import datetime
 
 
 def test_NDA(nda_file, ref_file):
     df = NewareNDA.read(nda_file)
     ref_df = pd.read_feather(ref_file)
+
+    # Convert dates to timestamps for comparison
+    df['Timestamp'] = df['Timestamp'].apply(datetime.timestamp)
+    ref_df['Timestamp'] = ref_df['Timestamp'].apply(datetime.timestamp)
+
     pd.testing.assert_frame_equal(df, ref_df, check_like=True)