Added __iter__ to UsersDB for a cleaner interface.

src/User.py

@@ -73,8 +73,7 @@ class User(callbacks.Privmsg):
         else:
             def p(s):
                 return True
-        users = [u.name for u in ircdb.users.users[1:] if u is not None]
-        users = filter(p, users)
+        users = [u.name for u in ircdb.users if p(u.name)]
         if users:
             utils.sortBy(str.lower, users)
             irc.reply(msg, utils.commaAndify(users))

src/ircdb.py

@@ -458,8 +458,13 @@ class UsersDB(object):
         except KeyError:
             return False
 
+    def __iter__(self):
+        x = ifilter(None, self.users)
+        x.next() # Skip the bot user.
+        return x
+        
     def numUsers(self):
-        return ilen(ifilter(None, self.users))-1 # -1 is for the bot user.
+        return ilen(self)
 
     def setUser(self, id, user):
         """Sets a user (given its id) to the IrcUser given it."""

test/test_ircdb.py

@@ -311,7 +311,7 @@ class UsersDBTestCase(unittest.TestCase):
             pass
         self.users = ircdb.UsersDB(self.filename)
 
-    def testNumUsers(self):
+    def testIterAndNumUsers(self):
         self.assertEqual(self.users.numUsers(), 0)
         (id, u) = self.users.newUser()
         hostmask = 'foo!bar@baz'