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

Fixing some issues due to import cleanup

Browse Source
This commit is contained in:
Ebag333
2016-12-14 13:06:13 -08:00
parent 0ebb992354
commit 956fa7a8b7
4 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
service/market.py
View File

@@ -28,7 +28,7 @@ from sqlalchemy.sql import or_
import config
import eos.db
# TODO: Find out what this is. There is no conversions
# from service import conversions
from service import conversions
from service.settings import SettingsProvider
from service.price import Price
@@ -410,15 +410,13 @@ class Market():
item = identity
elif isinstance(identity, int):
item = eos.db.getItem(identity, *args, **kwargs)
# TODO: Find out what this is. There is no conversions
"""
# Unindent 1 tab
elif isinstance(identity, basestring):
# We normally lookup with string when we are using import/export
# features. Check against overrides
identity = conversions.all.get(identity, identity)
item = eos.db.getItem(identity, *args, **kwargs)
"""
# TODO: Find out what this is. There is no conversions
elif isinstance(identity, basestring):
# We normally lookup with string when we are using import/export
# features. Check against overrides
identity = conversions.all.get(identity, identity)
item = eos.db.getItem(identity, *args, **kwargs)
elif isinstance(identity, float):
id = int(identity)
item = eos.db.getItem(id, *args, **kwargs)