Merge branch 'development' of https://github.com/pyfa-org/Pyfa into development

This commit is contained in:
blitzman
2017-02-13 23:27:40 -05:00
7 changed files with 14 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

@@ -40,7 +40,7 @@ class Price(object):
}
@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:
@@ -148,4 +147,4 @@ class Price(object):
for cargo in fit.cargo:
typeIDs.append(cargo.itemID)
return typeIDs
return typeIDs