Merge branch 'release/v16.4.15'

2021-06-17 06:30:18 +02:00
parent 7b0ac720f0 908f58993f
commit 4d5092302f
1 changed files with 7 additions and 0 deletions
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1846,9 +1846,16 @@ def get_startdate_time_zone(r,row,startdatetime=None):
            timezone_str = pendulum.instance(startdatetime).timezone.name
        except ValueError:
            timezone_str = 'Ect/GMT'
+    elif startdatetime == '':
+        startdatetime = row.rowdatetime
    else:
        startdatetime = row.rowdatetime

+    try:
+        tz = startdatetime.tzinfo
+    except AttributeError:
+        startdatetime = row.rowdatetime
+
    partofday = getpartofday(row,r)

    if startdatetime.tzinfo is None or str(startdatetime.tzinfo) in ['tzutc()','Ect/GMT']: