avoid error when timestamp is already a date

This commit is contained in:
zope 2021-11-24 09:32:41 +01:00
parent 1629defe3d
commit 674cd62ae6

View file

@ -38,6 +38,8 @@ def date2TimeStamp(d):
def timeStamp2Date(ts, useGM=False): def timeStamp2Date(ts, useGM=False):
if ts is None: if ts is None:
ts = getTimeStamp() ts = getTimeStamp()
if not isinstance(ts, (int, float)): # seems to be a date already
return ts
return datetime.fromtimestamp(ts) return datetime.fromtimestamp(ts)
def timeStamp2ISO(ts, useGM=False, format='%Y-%m-%d %H:%M'): def timeStamp2ISO(ts, useGM=False, format='%Y-%m-%d %H:%M'):