From 6e7ba714a809f030c2eb1048625e2ee55649a086 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sun, 13 Dec 2015 22:26:36 -0500 Subject: [PATCH] Bump Dev, and fix import errors (#474) --- config.py | 4 ++-- eos/db/gamedata/queries.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config.py b/config.py index 7b0da2e47..4c4373259 100644 --- a/config.py +++ b/config.py @@ -18,8 +18,8 @@ debug = False saveInRoot = False # Version data -version = "1.17.1" -tag = "Stable" +version = "1.17.2" +tag = "git" expansionName = "Frostline" expansionVersion = "1.0" evemonMinVersion = "4081" diff --git a/eos/db/gamedata/queries.py b/eos/db/gamedata/queries.py index fa7ce3ff3..93c43fc38 100644 --- a/eos/db/gamedata/queries.py +++ b/eos/db/gamedata/queries.py @@ -83,8 +83,7 @@ def getItem(lookfor, eager=None): else: # Item names are unique, so we can use first() instead of one() item = gamedata_session.query(Item).options(*processEager(eager)).filter(Item.name == lookfor).first() - if item: - itemNameMap[lookfor] = item.ID + itemNameMap[lookfor] = item.ID else: raise TypeError("Need integer or string as argument") return item