From 2c1ec5ae93aa44d80242e37fd52854382a83a305 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Fri, 24 Jun 2011 13:01:55 +0400 Subject: [PATCH] Support new directAttrRequest format in pyfa --- service/market.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/service/market.py b/service/market.py index 7425410dc..dea77cd7f 100644 --- a/service/market.py +++ b/service/market.py @@ -595,11 +595,18 @@ class Market(): """Find items according to given text pattern""" self.searchWorkerThread.scheduleSearch(name, callback) - def directAttrRequest(self, items, attrID): - itemIDs = tuple(map(lambda i: i.ID, items)) + def directAttrRequest(self, items, attribs): + try: + itemIDs = tuple(map(lambda i: i.ID, items)) + except TypeError: + itemIDs = (items.ID,) + try: + attrIDs = tuple(map(lambda i: i.ID, attribs)) + except TypeError: + attrIDs = (attribs.ID,) info = {} - for ID, val in eos.db.directAttributeRequest(itemIDs, attrID): - info[ID] = val + for itemID, typeID, val in eos.db.directAttributeRequest(itemIDs, attrIDs): + info[itemID] = val return info