From ef9362971920c6561015376d3f604bf6234f2547 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Thu, 18 Feb 2016 20:08:14 +0000 Subject: [PATCH] Fix pretty_print_time_interval for MySQL. Fix #1619. --- lib/galaxy/util/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/util/__init__.py b/lib/galaxy/util/__init__.py index 09235bcfe82e..960eb81a05d6 100644 --- 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