From 5ec50ea26cf89674d94bfc1ada7974d1a1768d9f Mon Sep 17 00:00:00 2001 From: "Lynn \"Zhorken\" Vaughan" Date: Sat, 9 Nov 2013 03:49:09 -0500 Subject: [PATCH] Make the rest of the tests pass. --- doc/main-tables.rst | 1 + pokedex/db/tables.py | 4 ++-- pokedex/tests/test_lookup.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/main-tables.rst b/doc/main-tables.rst index ce76481..3310ce6 100644 --- a/doc/main-tables.rst +++ b/doc/main-tables.rst @@ -150,6 +150,7 @@ Association tables .. dex-table:: NatureBattleStylePreference .. dex-table:: NaturePokeathlonStat .. dex-table:: PokeathlonStat +.. dex-table:: PokedexVersionGroup .. dex-table:: PokemonAbility .. dex-table:: PokemonEggGroup .. dex-table:: PokemonFormPokeathlonStat diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index 780e658..418bb65 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -1512,7 +1512,7 @@ class PokedexVersionGroup(TableBase): pokedex_id = Column(Integer, ForeignKey('pokedexes.id'), primary_key=True, info=dict(description=u'The ID of the Pokédex.')) version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, - info=dict(descruption=u'The ID of the version group.')) + info=dict(description=u'The ID of the version group.')) class Pokemon(TableBase): u"""A Pokémon. The core to this whole mess. @@ -2102,7 +2102,7 @@ class VersionGroup(TableBase): id = Column(Integer, primary_key=True, nullable=False, info=dict(description=u"This version group's unique ID.")) identifier = Column(Unicode(20), nullable=False, unique=True, - info=dict(description=u"This version group's unique textual identifier.")) + info=dict(description=u"This version group's unique textual identifier.", format='identifier')) generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False, info=dict(description=u"The ID of the generation the games in this group belong to.")) order = Column(Integer, nullable=True, diff --git a/pokedex/tests/test_lookup.py b/pokedex/tests/test_lookup.py index 48b773e..9683aaf 100644 --- a/pokedex/tests/test_lookup.py +++ b/pokedex/tests/test_lookup.py @@ -21,8 +21,8 @@ lookup = PokedexLookup() # Forms (u'Rotom', 'pokemon_species', 479), - (u'Wash Rotom', 'pokemon_forms', 708), - (u'East Shellos', 'pokemon_forms', 688), + (u'Wash Rotom', 'pokemon_forms', 10059), + (u'East Shellos', 'pokemon_forms', 10039), # Other languages (u'イーブイ', 'pokemon_species', 133),