From cbd217271d603ceb5e2d3ffee1e5763f1f2ebabf Mon Sep 17 00:00:00 2001 From: Ruud Date: Sun, 25 Aug 2013 00:59:37 +0200 Subject: [PATCH] Don't load options twice --- couchpotato/core/loader.py | 3 --- couchpotato/core/plugins/base.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/couchpotato/core/loader.py b/couchpotato/core/loader.py index ffb05cb..19315d2 100644 --- a/couchpotato/core/loader.py +++ b/couchpotato/core/loader.py @@ -86,9 +86,6 @@ class Loader(object): splitted = module.split('.') for sub in splitted[1:]: m = getattr(m, sub) - - if hasattr(m, 'config'): - fireEvent('settings.options', splitted[-1] + '_config', getattr(m, 'config')) except: raise diff --git a/couchpotato/core/plugins/base.py b/couchpotato/core/plugins/base.py index 84ecc45..89ef29b 100644 --- a/couchpotato/core/plugins/base.py +++ b/couchpotato/core/plugins/base.py @@ -39,7 +39,7 @@ class Plugin(object): http_failed_disabled = {} def __new__(typ, *args, **kwargs): - new_plugin = super(Plugin, typ).__new__(typ, *args, **kwargs) + new_plugin = super(Plugin, typ).__new__(typ) new_plugin.registerPlugin() return new_plugin