Tox fixes, and catching a few things lost in the merge.

This commit is contained in:
Ebag333
2017-02-11 09:23:23 -08:00
parent 81e5b33bc9
commit 096842de44
8 changed files with 17 additions and 15 deletions

View File

@@ -69,7 +69,9 @@ class Fit(object):
"showMarketShortcuts": False,
"enableGaugeAnimation": True,
"exportCharges": True,
"priceSystem": "Jita"}
"openFitInNew": False,
"priceSystem": "Jita",
}
self.serviceFittingOptions = SettingsProvider.getInstance().getSettings(
"pyfaServiceFittingOptions", serviceFittingDefaultOptions)

View File

@@ -41,7 +41,7 @@ class Price(object):
currentSystemId = ""
@classmethod
def invalidPrices(self, prices):
def invalidPrices(cls, prices):
for price in prices:
price.time = 0
@@ -130,10 +130,9 @@ class Price(object):
priceobj.failed = True
@classmethod
def fitItemsList(self, fit):
def fitItemsList(cls, fit):
# Compose a list of all the data we need & request it
typeIDs = []
typeIDs.append(fit.ship.item.ID)
typeIDs = [fit.ship.item.ID]
for mod in fit.modules:
if not mod.isEmpty:
@@ -151,4 +150,4 @@ class Price(object):
for _ in xrange(cargo.amount):
typeIDs.append(cargo.itemID)
return typeIDs
return typeIDs