cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge branch master

Browse source
This commit is contained in:
Helmut Merz 2013-12-14 09:22:58 +01:00
commit 3bb7796fbf
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
util/date.py
View file

@ -51,13 +51,14 @@ def formatTimeStamp(ts, useGM=False, format='%Y-%m-%d %H:%M'):
def str2timeStamp(s):
s = s.replace('T', ' ')
try:
t = time.strptime(s, '%Y-%m-%d %H:%M:%S')
t = time.strptime(s[:19], '%Y-%m-%d %H:%M:%S')
except ValueError:
try:
t = time.strptime(s, '%Y-%m-%d %H:%M')
t = time.strptime(s[:16], '%Y-%m-%d %H:%M')
except ValueError:
t = time.strptime(s, '%Y-%m-%d')
t = time.strptime(s[:10], '%Y-%m-%d')
return int(time.mktime(t))