From f5f8a8a75c197c1222c049f943182b6882604ffe Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 31 Jul 2020 09:35:07 +1200 Subject: [PATCH] import the controllers module explicitly --- console_conf/core.py | 2 ++ subiquity/core.py | 1 + subiquitycore/core.py | 4 +--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/console_conf/core.py b/console_conf/core.py index 445376a7..588baaf3 100644 --- a/console_conf/core.py +++ b/console_conf/core.py @@ -25,6 +25,7 @@ log = logging.getLogger("console_conf.core") class ConsoleConf(TuiApplication): + from console_conf import controllers as controllers_mod project = "console_conf" make_model = ConsoleConfModel @@ -38,6 +39,7 @@ class ConsoleConf(TuiApplication): class RecoveryChooser(TuiApplication): + from console_conf import controllers as controllers_mod project = "console_conf" controllers = [ diff --git a/subiquity/core.py b/subiquity/core.py index 02834042..6116a173 100644 --- a/subiquity/core.py +++ b/subiquity/core.py @@ -84,6 +84,7 @@ class Subiquity(TuiApplication): 'additionalProperties': True, } + from subiquity import controllers as controllers_mod project = "subiquity" def make_model(self): diff --git a/subiquitycore/core.py b/subiquitycore/core.py index c2b8d482..8cc6ad85 100644 --- a/subiquitycore/core.py +++ b/subiquitycore/core.py @@ -75,10 +75,8 @@ class Application: self.signal = Signal() self.prober = prober self.new_event_loop() - controllers_mod = __import__( - '{}.controllers'.format(self.project), None, None, ['']) self.controllers = ControllerSet( - controllers_mod, self.controllers, init_args=(self,)) + self.controllers_mod, self.controllers, init_args=(self,)) self.context = Context.new(self) def _exception_handler(self, loop, context):