From 833baae65b7b68d8f3492c4c3c0824a5fcbb42a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Borgstr=C3=B6m?= Date: Mon, 8 Aug 2011 20:55:09 +0200 Subject: [PATCH] Remove python 2.7 requirement for format_timedelta --- darc/helpers.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/darc/helpers.py b/darc/helpers.py index e8eca8168..6f83ba8e4 100644 --- a/darc/helpers.py +++ b/darc/helpers.py @@ -212,8 +212,16 @@ def format_time(t): def format_timedelta(td): - """Format timedelta in a human friendly format""" - ts = td.total_seconds() + """Format timedelta in a human friendly format + + >>> from datetime import datetime + >>> t0 = datetime(2001, 1, 1, 10, 20, 3, 0) + >>> t1 = datetime(2001, 1, 1, 12, 20, 4, 100000) + >>> format_timedelta(t1 - t0) + '2 hours 1.10 seconds' + """ + # Since td.total_seconds() requires python 2.7 + ts = (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / float(10**6) s = ts % 60 m = int(ts / 60) % 60 h = int(ts / 3600) % 24