Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-10-06 19:38:50 +02:00
Code Issues Projects Releases Wiki Activity

Account for negative times in timeElapsed.

Browse Source 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit aa2337791a)
This commit is contained in:
Ricky Zhou 2009-07-17 17:08:20 -04:00 committed by James Vega
parent 885d60a132
commit 6299ef5c22
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/utils/gen.py
View File

@ -77,6 +77,7 @@ def timeElapsed(elapsed, short=False, leadingZeroes=False, years=True,
be used. be used.
""" """
ret = [] ret = []
before = False
def Format(s, i): def Format(s, i):
if i or leadingZeroes or ret: if i or leadingZeroes or ret:
if short: if short:
@ -84,6 +85,12 @@ def timeElapsed(elapsed, short=False, leadingZeroes=False, years=True,
else: else:
ret.append(format('%n', (i, s))) ret.append(format('%n', (i, s)))
elapsed = int(elapsed) elapsed = int(elapsed)
# Handle negative times
if elapsed < 0:
before = True
elapsed = -elapsed
assert years or weeks or days or \ assert years or weeks or days or \
hours or minutes or seconds, 'One flag must be True' hours or minutes or seconds, 'One flag must be True'
if years: if years:
@ -107,10 +114,14 @@ def timeElapsed(elapsed, short=False, leadingZeroes=False, years=True,
Format('second', secs) Format('second', secs)
if not ret: if not ret:
raise ValueError, 'Time difference not great enough to be noted.' raise ValueError, 'Time difference not great enough to be noted.'
result = ''
if short: if short:
return ' '.join(ret) result = ' '.join(ret)
else: else:
return format('%L', ret) result = format('%L', ret)
if before:
result += ' ago'
return result
def findBinaryInPath(s): def findBinaryInPath(s):
"""Return full path of a binary if it's in PATH, otherwise return None.""" """Return full path of a binary if it's in PATH, otherwise return None."""