From 674cd62ae61ab13103f57f9ce4d71b5777719a3c Mon Sep 17 00:00:00 2001 From: zope Date: Wed, 24 Nov 2021 09:32:41 +0100 Subject: [PATCH] avoid error when timestamp is already a date --- util/date.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/date.py b/util/date.py index a325799..f614d35 100644 --- a/util/date.py +++ b/util/date.py @@ -38,6 +38,8 @@ def date2TimeStamp(d): def timeStamp2Date(ts, useGM=False): if ts is None: ts = getTimeStamp() + if not isinstance(ts, (int, float)): # seems to be a date already + return ts return datetime.fromtimestamp(ts) def timeStamp2ISO(ts, useGM=False, format='%Y-%m-%d %H:%M'):