Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-11 20:52:42 +01:00
Code Issues Projects Releases Wiki Activity

commaAndified timeElapsed.

Browse Source
This commit is contained in:
Jeremy Fincher 2003-08-21 16:31:11 +00:00
parent 526e5b613b
commit 6bfd991947
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils.py
View File

@ -164,7 +164,7 @@ def timeElapsed(elapsed, leadingZeroes=False, years=True, weeks=True,
if len(ret) == 1: if len(ret) == 1:
return ret[0] return ret[0]
else: else:
return ' and '.join([', '.join(ret[:-1]), ret[-1]]) return commaAndify(ret)
def distance(s, t): def distance(s, t):
"""Returns the levenshtein edit distance between two strings.""" """Returns the levenshtein edit distance between two strings."""

4
test/test_utils.py
View File

@ -45,8 +45,8 @@ class UtilsTest(unittest.TestCase):
(61, '1 minute and 1 second'), (61, '1 minute and 1 second'),
(62, '1 minute and 2 seconds'), (62, '1 minute and 2 seconds'),
(122, '2 minutes and 2 seconds'), (122, '2 minutes and 2 seconds'),
(3722, '1 hour, 2 minutes and 2 seconds'), (3722, '1 hour, 2 minutes, and 2 seconds'),
(7322, '2 hours, 2 minutes and 2 seconds')]: (7322, '2 hours, 2 minutes, and 2 seconds')]:
self.assertEqual(utils.timeElapsed(now - then), expected) self.assertEqual(utils.timeElapsed(now - then), expected)
def testEachSubstring(self): def testEachSubstring(self):