Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-10-03 01:48:52 +02:00
Code Issues Projects Releases Wiki Activity

Swapped the argument order for nItems *again*.

Browse Source
This commit is contained in:
Jeremy Fincher 2005-01-28 15:17:26 +00:00
parent e248012369
commit 34f1fe6562
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/callbacks.py
View File

@ -866,7 +866,7 @@ class IrcObjectProxy(RichReplyMethods):
response = msgs.pop() response = msgs.pop()
if msgs: if msgs:
n = ircutils.bold('(%s)') n = ircutils.bold('(%s)')
n %= utils.str.nItems('message', len(msgs), 'more') n %= utils.str.nItems(len(msgs), 'message', 'more')
response = '%s %s' % (response, n) response = '%s %s' % (response, n)
prefix = msg.prefix prefix = msg.prefix
if self.to and ircutils.isNick(self.to): if self.to and ircutils.isNick(self.to):

2
src/utils/gen.py
View File

@ -81,7 +81,7 @@ def timeElapsed(elapsed, short=False, leadingZeroes=False, years=True,
if short: if short:
ret.append('%s%s' % (i, s[0])) ret.append('%s%s' % (i, s[0]))
else: else:
ret.append(nItems(s, i)) ret.append(nItems(i, s))
elapsed = int(elapsed) elapsed = int(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'

10
src/utils/str.py
View File

@ -285,18 +285,20 @@ def depluralize(s):
else: else:
return s # Don't know what to do. return s # Don't know what to do.
def nItems(item, n, between=None): def nItems(n, item, between=None):
"""Works like this: """Works like this:
>>> nItems('clock', 1) >>> nItems(1, 'clock')
'1 clock' '1 clock'
>>> nItems('clock', 10) >>> nItems(10, 'clock')
'10 clocks' '10 clocks'
>>> nItems('clock', 10, between='grandfather') >>> nItems(10, 'clock', between='grandfather')
'10 grandfather clocks' '10 grandfather clocks'
""" """
assert isinstance(n, int), \
'The order of the arguments to nItems changed again, sorry.'
if between is None: if between is None:
return '%s %s' % (n, pluralize(item, n)) return '%s %s' % (n, pluralize(item, n))
else: else:

8
test/test_utils.py
View File

@ -335,10 +335,10 @@ class StrTest(SupyTestCase):
def testNItems(self): def testNItems(self):
nItems = utils.str.nItems nItems = utils.str.nItems
self.assertEqual(nItems('tool', 1, 'crazy'), '1 crazy tool') self.assertEqual(nItems(1, 'tool', 'crazy'), '1 crazy tool')
self.assertEqual(nItems('tool', 1), '1 tool') self.assertEqual(nItems(1, 'tool'), '1 tool')
self.assertEqual(nItems('tool', 2, 'crazy'), '2 crazy tools') self.assertEqual(nItems(2, 'tool', 'crazy'), '2 crazy tools')
self.assertEqual(nItems('tool', 2), '2 tools') self.assertEqual(nItems(2, 'tool'), '2 tools')
def testEllipsisify(self): def testEllipsisify(self):
f = utils.str.ellipsisify f = utils.str.ellipsisify