Merge pull request #1761 from nsoranzo/release_15.10_fix_for_1619

[15.10] Fix pretty_print_time_interval for MySQL.
galaxyproject · Feb 18, 2016 · 6c83fbe · 6c83fbe
2 parents 476734d + ef93629
commit 6c83fbe
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/galaxy/util/__init__.py b/lib/galaxy/util/__init__.py
@@ -352,7 +352,11 @@ def pretty_print_time_interval( time=False, precise=False ):
     elif isinstance( time, datetime ):
         diff = now - time
     elif isinstance( time, basestring ):
-        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