PsychoticNinja/Limnoria
1
0
Fork 0
mirror of https://github.com/progval/Limnoria.git synced 2025-05-06 11:33:39 -05:00
Code Issues Projects Releases Wiki Activity

Made usernames case-insensitive.

Browse Source
This commit is contained in:
Jeremy Fincher 2003-09-14 07:05:41 +00:00
parent df9ce1b632
commit feb85382af
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ircdb.py
View File

@ -376,15 +376,16 @@ class UsersDB(object):
else: else:
raise ValueError, 'Ids %r matched.' % ids raise ValueError, 'Ids %r matched.' % ids
else: # Not a hostmask, must be a name. else: # Not a hostmask, must be a name.
s = s.lower()
try: try:
return self._nameCache[s] return self._nameCache[s]
except KeyError: except KeyError:
for (id, user) in enumerate(self.users): for (id, user) in enumerate(self.users):
if user is None: if user is None:
continue continue
if s == user.name: if s == user.name.lower():
self._nameCache[s] = id self._nameCache[s] = id
self._nameCache.setdefault(id, sets.Set()).add(s) self._nameCache[id] = s
return id return id
else: else:
raise KeyError, s raise KeyError, s
@ -429,8 +430,7 @@ class UsersDB(object):
except KeyError: except KeyError:
continue continue
if id in self._nameCache: if id in self._nameCache:
for name in self._nameCache[id]: del self._nameCache[self._nameCache[id]]
del self._nameCache[name]
del self._nameCache[id] del self._nameCache[id]
if id in self._hostmaskCache: if id in self._hostmaskCache:
for hostmask in self._hostmaskCache[id]: for hostmask in self._hostmaskCache[id]:
@ -444,8 +444,9 @@ class UsersDB(object):
if not 0 <= id < len(self.users) or self.users[id] is None: if not 0 <= id < len(self.users) or self.users[id] is None:
raise KeyError, id raise KeyError, id
self.users[id] = None self.users[id] = None
for name in self._nameCache.get(id, []): if id in self._nameCache:
del self._nameCache[name] del self._nameCache[self._nameCache[id]]
del self._nameCache[id]
for hostmask in self._hostmaskCache.get(id, []): for hostmask in self._hostmaskCache.get(id, []):
del self._hostmaskCache[hostmask] del self._hostmaskCache[hostmask]

1
test/test_ircdb.py
View File

@ -275,6 +275,7 @@ class UsersDBTestCase(unittest.TestCase):
u.name = 'foo' u.name = 'foo'
self.users.setUser(id, u) self.users.setUser(id, u)
self.assertEqual(self.users.getUser('foo'), u) self.assertEqual(self.users.getUser('foo'), u)
self.assertEqual(self.users.getUser('FOO'), u)
self.assertEqual(self.users.getUser(hostmask), u) self.assertEqual(self.users.getUser(hostmask), u)
self.assertEqual(self.users.getUser(banmask), u) self.assertEqual(self.users.getUser(banmask), u)
# The UsersDB shouldn't allow users to be added whose hostmasks # The UsersDB shouldn't allow users to be added whose hostmasks