opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_15.10' into release_16.01

Browse Source 
Conflicts:
	lib/galaxy/util/__init__.py
This commit is contained in:
Nicola Soranzo
2016-02-19 11:41:10 +00:00
parent b4c823f2cd 6c83fbe24d
commit b5e91d2377
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/util/__init__.py
+5 -1
View File
@@ -361,7 +361,11 @@ def pretty_print_time_interval( time=False, precise=False ):
elif isinstance( time, datetime ):
diff = now - time
elif isinstance( time, string_types ):
time = datetime.strptime( time, "%Y-%m-%dT%H:%M:%S.%f" )
try:
time = datetime.strptime( time, "%Y-%m-%dT%H:%M:%S.%f" )
except ValueError:
# MySQL may not support microseconds precision
time = datetime.strptime( time, "%Y-%m-%dT%H:%M:%S" )
diff = now - time
else:
diff = now - now