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