diff --git a/Makefile b/Makefile index 081ac8ce..c385889d 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ install_deps_amd64: sudo apt-get install grub-efi-amd64-signed install_deps: install_deps_$(ARCH) - sudo apt-get install python3-urwid python3-pyudev python3-nose python3-flake8 python3-yaml python3-tornado git bzr ubuntu-cloudimage-keyring python3-coverage ovmf shim shim-signed grub-pc-bin + sudo apt-get install python3-urwid python3-pyudev python3-nose python3-flake8 python3-yaml git bzr ubuntu-cloudimage-keyring python3-coverage ovmf shim shim-signed grub-pc-bin dryrun: probert $(MAKE) ui-view DRYRUN="--dry-run --uefi --install" diff --git a/debian/control b/debian/control index 87ad627f..cd8104f1 100644 --- a/debian/control +++ b/debian/control @@ -40,7 +40,6 @@ Description: Ubuntu Server Installer Package: subiquitycore Architecture: all Depends: probert, - python3-tornado, python3-urwid (>= 1.2.1), python3-yaml, ${misc:Depends}, diff --git a/installer/geninstaller b/installer/geninstaller index ebc72679..0cd366ee 100755 --- a/installer/geninstaller +++ b/installer/geninstaller @@ -58,7 +58,6 @@ INSTALLER_DEPS=( "python3-urwid" "python3-pyudev" "python-urwid" - "python3-tornado" "probert" "xfsprogs" "curtin" diff --git a/requirements.txt b/requirements.txt index e5809e75..e843c4e7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,3 @@ nose-cov nose flake8 python3-parted -tornado diff --git a/subiquitycore/core.py b/subiquitycore/core.py index a3285e39..06700cd2 100644 --- a/subiquitycore/core.py +++ b/subiquitycore/core.py @@ -17,9 +17,6 @@ from concurrent import futures import logging import urwid -from tornado.ioloop import IOLoop -from tornado.util import import_object - from subiquitycore.signals import Signal from subiquitycore.palette import STYLES, STYLES_MONO from subiquitycore.prober import Prober, ProberException @@ -134,19 +131,17 @@ class Application: additional_opts['screen'].set_terminal_properties(colors=256) additional_opts['screen'].reset_default_terminal_palette() - evl = urwid.TornadoEventLoop(IOLoop()) self.common['loop'] = urwid.MainLoop( - self.common['ui'], palette, event_loop=evl, **additional_opts) + self.common['ui'], palette, **additional_opts) log.debug("Running event loop: {}".format( self.common['loop'].event_loop)) try: self.common['loop'].set_alarm_in(0.05, self.next_screen) + controllers_mod = __import__('%s.controllers' % self.project, None, None, ['']) for k in self.common['controllers']: log.debug("Importing controller: {}".format(k)) - klass = import_object( - ("%s.controllers.{}Controller" % self.project).format( - k)) + klass = getattr(controllers_mod, k+"Controller") self.common['controllers'][k] = klass(self.common) log.debug("*** %s", self.common['controllers']) self._connect_base_signals()