bugfix
This commit is contained in:
parent
b4d53d75af
commit
24c50d6526
@ -168,7 +168,7 @@ def StepedTimestamp(baseTs,ts,step) :
|
|||||||
def timestampAdd(ts1,ts2) :
|
def timestampAdd(ts1,ts2) :
|
||||||
t1 = time.strptime(ts1,DTFORMAT)
|
t1 = time.strptime(ts1,DTFORMAT)
|
||||||
tf = time.mktime(t1)
|
tf = time.mktime(t1)
|
||||||
if isinstance(ts2, str):
|
if isinstance(ts2, str):
|
||||||
t2 = time.strptime(ts2,DTFORMAT)
|
t2 = time.strptime(ts2,DTFORMAT)
|
||||||
ts2 = time.mktime(t2)
|
ts2 = time.mktime(t2)
|
||||||
tf += ts2
|
tf += ts2
|
||||||
@ -176,8 +176,8 @@ def timestampAdd(ts1,ts2) :
|
|||||||
|
|
||||||
def timestampSub(ts1,ts2) :
|
def timestampSub(ts1,ts2) :
|
||||||
t1 = time.strptime(ts1,DTFORMAT)
|
t1 = time.strptime(ts1,DTFORMAT)
|
||||||
if isinstance(ts2, str):
|
if isinstance(ts2, str):
|
||||||
t2 = time.strptime(ts2,DTFORMAT)
|
t2 = time.strptime(ts2,DTFORMAT)
|
||||||
ret = time.mktime(t1) - time.mktime(t2)
|
ret = time.mktime(t1) - time.mktime(t2)
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user