From 2b6994428e566e84d121f883dd01b9e46a45e6f4 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Tue, 1 Feb 2005 07:06:36 +0000 Subject: [PATCH] Fixed a bug that was introduced in nItems. --- src/utils/str.py | 4 ++-- test/test_utils.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/utils/str.py b/src/utils/str.py index 3dc294f74..aa18f48f8 100644 --- a/src/utils/str.py +++ b/src/utils/str.py @@ -299,12 +299,12 @@ def nItems(n, item, between=None): assert isinstance(n, int), \ 'The order of the arguments to nItems changed again, sorry.' if between is None: - if n > 1: + if n != 1: return format('%s %p', n, item) else: return format('%s %s', n, item) else: - if n > 1: + if n != 1: return format('%s %s %p', n, between, item) else: return format('%s %s %s', n, between, item) diff --git a/test/test_utils.py b/test/test_utils.py index 80956ef2c..6eee22d1c 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -328,6 +328,7 @@ class StrTest(SupyTestCase): def testNItems(self): nItems = utils.str.nItems + self.assertEqual(nItems(0, 'tool'), '0 tools') self.assertEqual(nItems(1, 'tool', 'crazy'), '1 crazy tool') self.assertEqual(nItems(1, 'tool'), '1 tool') self.assertEqual(nItems(2, 'tool', 'crazy'), '2 crazy tools')