From 54823e364c2da52f2b039b7abc45717b44578625 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Mon, 4 Nov 2019 23:51:47 +1300 Subject: [PATCH] remove signal sent after debug shell exits --- subiquity/core.py | 9 +-------- subiquitycore/core.py | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/subiquity/core.py b/subiquity/core.py index 55f8106c..7c870460 100644 --- a/subiquity/core.py +++ b/subiquity/core.py @@ -17,8 +17,6 @@ import logging import os import platform -import urwid - from subiquitycore.core import Application from subiquity.models.subiquity import SubiquityModel @@ -46,8 +44,6 @@ installed system will be mounted at /target.""") class Subiquity(Application): - signals = ['debug-shell-exited'] - snapd_socket_path = '/run/snapd.socket' from subiquity.palette import COLORS, STYLES, STYLES_MONO @@ -127,8 +123,5 @@ class Subiquity(Application): os.system("clear") print(DEBUG_SHELL_INTRO) - def _after(): - urwid.emit_signal(self, 'debug-shell-exited') - self.run_command_in_foreground( - "bash", before_hook=_before, after_hook=_after, cwd='/') + "bash", before_hook=_before, cwd='/') diff --git a/subiquitycore/core.py b/subiquitycore/core.py index 2b484d96..b4ba3dce 100644 --- a/subiquitycore/core.py +++ b/subiquitycore/core.py @@ -268,7 +268,7 @@ class DummyKeycodesFilter: return keys -class Application(metaclass=urwid.MetaSignals): +class Application: # A concrete subclass must set project and controllers attributes, e.g.: #