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

Make some imports more explicit

Browse Source
This commit is contained in:
Ebag333
2016-12-13 23:49:37 -08:00
parent 622a734405
commit e3b592977a
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
service/market.py
View File

@@ -27,7 +27,8 @@ from sqlalchemy.sql import or_
import config
import eos.db
from service import conversions
# TODO: Find out what this is. There is no conversions
# from service import conversions
from service.settings import SettingsProvider
from service.price import Price
@@ -257,9 +258,12 @@ class Market():
"Civilian Light Electron Blaster": True,
}
# TODO: Find out what this is. There is no conversions
# do not publish ships that we convert
'''
for name in conversions.packs['skinnedShips']:
self.ITEMS_FORCEPUBLISHED[name] = False
'''
if config.debug:
# Publish Tactical Dessy Modes if in debug
@@ -406,11 +410,15 @@ class Market():
item = identity
elif isinstance(identity, int):
item = eos.db.getItem(identity, *args, **kwargs)
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
"""
# 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)
"""
elif isinstance(identity, float):
id = int(identity)
item = eos.db.getItem(id, *args, **kwargs)