From: Eevee <git@veekun.com>
Date: Fri, 30 Apr 2010 07:22:03 +0000 (-0700)
Subject: Lookup now respects "ability" as a lookup type.
X-Git-Tag: veekun-promotions/2010050901~18
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/4f0f9288d81c541de51e5a490951282bddb196a7

Lookup now respects "ability" as a lookup type.
---

diff --git a/pokedex/lookup.py b/pokedex/lookup.py
index ce5bb76..f029b77 100644
--- a/pokedex/lookup.py
+++ b/pokedex/lookup.py
@@ -290,15 +290,17 @@ class PokedexLookup(object):
 
         Returns None for a bogus name.
         """
+        # Table object
         if hasattr(name, '__tablename__'):
             return getattr(name, '__tablename__')
-        elif name in self.indexed_tables:
-            return name
-        elif name + 's' in self.indexed_tables:
-            return name + 's'
-        else:
-            # Bogus.  Be nice and return dummy
-            return None
+
+        # Table name
+        for table in self.indexed_tables.values():
+            if name in (table.__tablename__, table.__singlename__):
+                return table.__tablename__
+
+        # Bogus.  Be nice and return dummy
+        return None
 
     def _whoosh_records_to_results(self, records, exact=True):
         """Converts a list of whoosh's indexed records to LookupResult tuples