From da922601cda6b05d636614ce557d2d3b5b14be39 Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Wed, 8 Mar 2017 20:59:53 -0800 Subject: [PATCH 1/2] You say Potatoe, I say tomahtie --- gui/builtinPreferenceViews/pyfaStatViewPreferences.py | 4 ++-- gui/builtinStatsViews/targetingMiscViewFull.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gui/builtinPreferenceViews/pyfaStatViewPreferences.py b/gui/builtinPreferenceViews/pyfaStatViewPreferences.py index 628333065..e285568e6 100644 --- a/gui/builtinPreferenceViews/pyfaStatViewPreferences.py +++ b/gui/builtinPreferenceViews/pyfaStatViewPreferences.py @@ -81,7 +81,7 @@ class PFStatViewPref(PreferenceView): self.rbMisc = wx.RadioBox(panel, -1, "Misc", wx.DefaultPosition, wx.DefaultSize, ['None', 'Minimal', 'Full'], 1, wx.RA_SPECIFY_COLS) # Disable full as we don't have a view for this yet self.rbMisc.EnableItem(2, False) - self.rbMisc.SetSelection(self.settings.get('targetingmisc')) + self.rbMisc.SetSelection(self.settings.get('targetingMisc')) rbSizerRow2.Add(self.rbMisc, 1, wx.ALL, 5) self.rbMisc.Bind(wx.EVT_RADIOBOX, self.OnTargetingMiscChange) @@ -137,7 +137,7 @@ class PFStatViewPref(PreferenceView): self.settings.set('capacitor', event.GetInt()) def OnTargetingMiscChange(self, event): - self.settings.set('targetingmisc', event.GetInt()) + self.settings.set('targetingMisc', event.GetInt()) def OnPriceChange(self, event): self.settings.set('price', event.GetInt()) diff --git a/gui/builtinStatsViews/targetingMiscViewFull.py b/gui/builtinStatsViews/targetingMiscViewFull.py index 27e83fea8..1fa235ba0 100644 --- a/gui/builtinStatsViews/targetingMiscViewFull.py +++ b/gui/builtinStatsViews/targetingMiscViewFull.py @@ -29,7 +29,7 @@ except ImportError: class TargetingMiscViewFull(StatsView): - name = "targetingmiscViewFull" + name = "targetingMiscViewFull" def __init__(self, parent): StatsView.__init__(self) From 9da485da55df77ee20374f08ff4884830864fae1 Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Wed, 8 Mar 2017 21:02:57 -0800 Subject: [PATCH 2/2] Cleaning up tox errors that crept in by the pep8 gremlins. --- eos/config.py | 1 - eos/effects/tractorbeamcan.py | 3 ++- service/port.py | 2 +- service/settings.py | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eos/config.py b/eos/config.py index cf5b2e937..38371e299 100644 --- a/eos/config.py +++ b/eos/config.py @@ -16,4 +16,3 @@ settings = { # Autodetect path, only change if the autodetection bugs out. path = dirname(unicode(__file__, sys.getfilesystemencoding())) - diff --git a/eos/effects/tractorbeamcan.py b/eos/effects/tractorbeamcan.py index c865b1c22..2c7f8eae3 100644 --- a/eos/effects/tractorbeamcan.py +++ b/eos/effects/tractorbeamcan.py @@ -2,8 +2,9 @@ # # Used by: # Modules from group: Tractor Beam (4 of 4) -type = "active" from eos.config import settings +type = "active" + def handler(fit, module, context): print settings['setting1'] diff --git a/service/port.py b/service/port.py index 3c0930810..3e923ed0f 100644 --- a/service/port.py +++ b/service/port.py @@ -816,7 +816,7 @@ class Port(object): if callback: wx.CallAfter(callback, None) # Skip fit silently if we get an exception - except Exception as e: + except Exception as e: pyfalog.error("Caught exception on fit.") pyfalog.error(e) pass diff --git a/service/settings.py b/service/settings.py index 0159bc516..5d44d4e88 100644 --- a/service/settings.py +++ b/service/settings.py @@ -437,6 +437,7 @@ class ContextMenuSettings(object): def set(self, type, value): self.ContextMenuDefaultSettings[type] = value + class EOSSettings(object): _instance = None