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

README.md

@@ -1,6 +1,6 @@
 # pyfa
 
-[![Join us on Slack!](https://pyfainvite.azurewebsites.net/badge.svg)](https://pyfainvite.azurewebsites.net/)
+[![Join us on Slack!](https://pyfainvite.azurewebsites.net/badge.svg)](https://pyfainvite.azurewebsites.net/) [![Build Status](https://travis-ci.org/pyfa-org/Pyfa.svg?branch=master)](https://travis-ci.org/pyfa-org/Pyfa)
 
 ![pyfa](https://cloud.githubusercontent.com/assets/3904767/10271512/af385ef2-6ade-11e5-8f67-52b8b1e4c797.PNG)
 

eos/effectHandlerHelpers.py

@@ -159,7 +159,6 @@ class HandledModuleList(HandledList):
             dummy.position = index
             self[index] = dummy
 
-
     def toModule(self, index, mod):
         mod.position = index
         self[index] = mod

gui/builtinPreferenceViews/pyfaGeneralPreferences.py

@@ -11,6 +11,7 @@ from service.fit import Fit
 from service.price import Price
 from service.market import Market
 
+
 class PFGeneralPref(PreferenceView):
     title = "General"
 
@@ -87,10 +88,10 @@ class PFGeneralPref(PreferenceView):
         self.stDefaultSystem.Wrap(-1)
         priceSizer.Add(self.stDefaultSystem, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
 
-        self.chPriceSystem = wx.Choice( panel, choices=Price.systemsList.keys())
+        self.chPriceSystem = wx.Choice(panel, choices=Price.systemsList.keys())
         priceSizer.Add(self.chPriceSystem, 1, wx.ALL | wx.EXPAND, 5)
 
-        mainSizer.Add(priceSizer, 0, wx.ALL|wx.EXPAND, 0)
+        mainSizer.Add(priceSizer, 0, wx.ALL | wx.EXPAND, 0)
 
         self.sFit = Fit.getInstance()
 
@@ -207,4 +208,5 @@ class PFGeneralPref(PreferenceView):
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
         event.Skip()
 
+
 PFGeneralPref.register()

gui/builtinStatsViews/priceViewFull.py

@@ -72,7 +72,6 @@ class PriceViewFull(StatsView):
             setattr(self, "labelPrice%s" % type.capitalize(), lbl)
             hbox.Add(lbl, 0, wx.ALIGN_LEFT)
 
-
     def refreshPanel(self, fit):
         if fit is not None:
             self.fit = fit

gui/graphFrame.py

@@ -42,7 +42,6 @@ except ImportError:
     mplImported = False
 
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -69,10 +68,9 @@ class GraphFrame(wx.Frame):
             from matplotlib.figure import Figure
             graphFrame_enabled = True
         except ImportError:
-            mpl = Canvas = Figure = None
+            Patch = mpl = Canvas = Figure = None
             graphFrame_enabled = False
 
-
         self.legendFix = False
         if not graphFrame_enabled:
             logger.info("Problems importing matplotlib; continuing without graphs")
@@ -284,7 +282,7 @@ class GraphFrame(wx.Frame):
                     selected_color = legend_colors[i]
                 except:
                     selected_color = None
-                legend2.append(self.Patch(color=selected_color,label=i_name),)
+                legend2.append(self.Patch(color=selected_color, label=i_name), )
 
             if len(legend2) > 0:
                 leg = self.subplot.legend(handles=legend2)

service/fit.py

@@ -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)

service/price.py

@@ -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 = [fit.ship.item.ID]
-        typeIDs.append(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