dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Convert floats to ints on service side

Browse Source
This commit is contained in:
DarkPhoenix
2011-06-13 20:41:52 +04:00
parent 1205ce69c5
commit 29bb52398e
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
service/market.py
View File

@@ -308,11 +308,15 @@ class Market():
def getItem(self, identity, *args, **kwargs): def getItem(self, identity, *args, **kwargs):
"""Get item by its ID or name""" """Get item by its ID or name"""
if isinstance(identity, eos.types.Item): if isinstance(identity, eos.types.Item):
return identity item = identity
elif isinstance(identity, (int, float, basestring)): elif isinstance(identity, (int, basestring)):
return eos.db.getItem(identity, *args, **kwargs) item = eos.db.getItem(identity, *args, **kwargs)
elif isinstance(identity, float):
id = int(identity)
item = eos.db.getItem(id, *args, **kwargs)
else: else:
raise TypeError("Need Item object, integer, float or string as argument") raise TypeError("Need Item object, integer, float or string as argument")
return item
def getGroup(self, identity, *args, **kwargs): def getGroup(self, identity, *args, **kwargs):
"""Get group by its ID or name""" """Get group by its ID or name"""
@@ -338,29 +342,39 @@ class Market():
def getCategory(self, identity, *args, **kwargs): def getCategory(self, identity, *args, **kwargs):
"""Get category by its ID or name""" """Get category by its ID or name"""
if isinstance(identity, eos.types.Category): if isinstance(identity, eos.types.Category):
return identity category = identity
elif isinstance(identity, (int, float, basestring)): elif isinstance(identity, (int, basestring)):
return eos.db.getCategory(identity, *args, **kwargs) category = eos.db.getCategory(identity, *args, **kwargs)
elif isinstance(identity, float):
id = int(identity)
category = eos.db.getCategory(id, *args, **kwargs)
else: else:
raise TypeError("Need Category object, integer, float or string as argument") raise TypeError("Need Category object, integer, float or string as argument")
return category
def getMetaGroup(self, identity, *args, **kwargs): def getMetaGroup(self, identity, *args, **kwargs):
"""Get meta group by its ID or name""" """Get meta group by its ID or name"""
if isinstance(identity, eos.types.MetaGroup): if isinstance(identity, eos.types.MetaGroup):
return identity metaGroup = identity
elif isinstance(identity, (int, float, basestring)): elif isinstance(identity, (int, basestring)):
return eos.db.getMetaGroup(identity, *args, **kwargs) metaGroup = eos.db.getMetaGroup(identity, *args, **kwargs)
elif isinstance(identity, float):
id = int(identity)
metaGroup = eos.db.getMetaGroup(id, *args, **kwargs)
else: else:
raise TypeError("Need MetaGroup object, integer, float or string as argument") raise TypeError("Need MetaGroup object, integer, float or string as argument")
return metaGroup
def getMarketGroup(self, identity, *args, **kwargs): def getMarketGroup(self, identity, *args, **kwargs):
"""Get market group by its ID""" """Get market group by its ID"""
if isinstance(identity, eos.types.MarketGroup): if isinstance(identity, eos.types.MarketGroup):
return identity marketGroup = identity
elif isinstance(identity, (int, float)): elif isinstance(identity, (int, float)):
return eos.db.getMarketGroup(identity, *args, **kwargs) id = int(identity)
marketGroup = eos.db.getMarketGroup(id, *args, **kwargs)
else: else:
raise TypeError("Need MarketGroup object, integer or float as argument") raise TypeError("Need MarketGroup object, integer or float as argument")
return marketGroup
def getGroupByItem(self, item): def getGroupByItem(self, item):
"""Get group by item""" """Get group by item"""