From b4d53d75af4910ffd2241cdf737090d2bd6dea5e Mon Sep 17 00:00:00 2001 From: yumoqing Date: Thu, 14 May 2026 15:00:49 +0800 Subject: [PATCH] bugfix --- appPublic/timeUtils.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appPublic/timeUtils.py b/appPublic/timeUtils.py index 2a87d43..0912878 100755 --- a/appPublic/timeUtils.py +++ b/appPublic/timeUtils.py @@ -168,18 +168,18 @@ def StepedTimestamp(baseTs,ts,step) : def timestampAdd(ts1,ts2) : t1 = time.strptime(ts1,DTFORMAT) tf = time.mktime(t1) - if type(ts2)=='' : + if isinstance(ts2, str): t2 = time.strptime(ts2,DTFORMAT) ts2 = time.mktime(t2) tf += ts2 - t = time.localtime(tf) - return TimeStamp(t) + return tf def timestampSub(ts1,ts2) : t1 = time.strptime(ts1,DTFORMAT) - t2 = time.strptime(ts2,DTFORMAT) + if isinstance(ts2, str): + t2 = time.strptime(ts2,DTFORMAT) ret = time.mktime(t1) - time.mktime(t2) - return int(ret) + return ret def timestamp2dt(t): return datetime.fromtimestamp(t)