sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v16.4.15'

Browse Source
This commit is contained in:
Sander Roosendaal
2021-06-17 06:30:18 +02:00
parent 7b0ac720f0 908f58993f
commit 4d5092302f
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/dataprep.py
View File

@@ -1846,9 +1846,16 @@ def get_startdate_time_zone(r,row,startdatetime=None):
timezone_str = pendulum.instance(startdatetime).timezone.name timezone_str = pendulum.instance(startdatetime).timezone.name
except ValueError: except ValueError:
timezone_str = 'Ect/GMT' timezone_str = 'Ect/GMT'
elif startdatetime == '':
startdatetime = row.rowdatetime
else: else:
startdatetime = row.rowdatetime startdatetime = row.rowdatetime
try:
tz = startdatetime.tzinfo
except AttributeError:
startdatetime = row.rowdatetime
partofday = getpartofday(row,r) partofday = getpartofday(row,r)
if startdatetime.tzinfo is None or str(startdatetime.tzinfo) in ['tzutc()','Ect/GMT']: if startdatetime.tzinfo is None or str(startdatetime.tzinfo) in ['tzutc()','Ect/GMT']: