chris/galvani
1
0
Fork 0
mirror of https://github.com/echemdata/galvani.git synced 2025-12-14 09:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Also try parsing dates as '%m-%d-%y' - fixes #20

Browse Source
This commit is contained in:
Chris Kerr
2019-03-30 15:35:26 +01:00
parent 2471148c21
commit b977115d6e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
galvani/BioLogic.py
View File

@@ -360,12 +360,18 @@ class MPRfile:
self.cols = column_types self.cols = column_types
self.npts = n_data_points self.npts = n_data_points
try:
tm = time.strptime(str3(settings_mod['date']), '%m/%d/%y') tm = time.strptime(str3(settings_mod['date']), '%m/%d/%y')
except ValueError:
tm = time.strptime(str3(settings_mod['date']), '%m-%d-%y')
self.startdate = date(tm.tm_year, tm.tm_mon, tm.tm_mday) self.startdate = date(tm.tm_year, tm.tm_mon, tm.tm_mday)
if maybe_log_module: if maybe_log_module:
log_module, = maybe_log_module log_module, = maybe_log_module
try:
tm = time.strptime(str3(log_module['date']), '%m/%d/%y') tm = time.strptime(str3(log_module['date']), '%m/%d/%y')
except ValueError:
tm = time.strptime(str3(log_module['date']), '%m-%d-%y')
self.enddate = date(tm.tm_year, tm.tm_mon, tm.tm_mday) self.enddate = date(tm.tm_year, tm.tm_mon, tm.tm_mday)
## There is a timestamp at either 465 or 469 bytes ## There is a timestamp at either 465 or 469 bytes