remove general clever escape handling

This commit is contained in:
Michael Hudson-Doyle 2017-04-05 15:16:30 +12:00
parent 387f2c7b76
commit b3241d6b15
3 changed files with 1 additions and 20 deletions

View File

@ -61,7 +61,6 @@ class FilesystemController(BaseController):
def reset(self):
log.info("Resetting Filesystem model")
self.model.reset()
self.view_stack = []
self.default()
def cancel(self):

View File

@ -102,14 +102,13 @@ class IdentityView(BaseView):
self.form = IdentityForm()
connect_signal(self.form, 'submit', self.done)
connect_signal(self.form, 'cancel', self.cancel)
self.ssh_import_confirmed = True
body = [
Padding.center_90(self.form.as_rows(self)),
Padding.line_break(""),
Padding.fixed_10(self.form.buttons),
Padding.fixed_10(self.form.buttons[0]),
]
super().__init__(ListBox(body))
@ -136,6 +135,3 @@ class IdentityView(BaseView):
log.debug("User input: {}".format(result))
self.controller.create_user(result)
def cancel(self, button):
self.controller.cancel()

View File

@ -20,14 +20,6 @@ import os
log = logging.getLogger("subiquitycore.controller")
def view(func):
n = func.__name__
def f(self, *args, **kw):
m = getattr(self, n)
self.view_stack.append((m, args, kw))
return func(self, *args, **kw)
return f
class BaseController(ABC):
"""Base class for controllers."""
@ -42,7 +34,6 @@ class BaseController(ABC):
self.prober = common['prober']
self.controllers = common['controllers']
self.pool = common['pool']
self.view_stack = []
def register_signals(self):
"""Defines signals associated with controller from model."""
@ -51,11 +42,6 @@ class BaseController(ABC):
signals.append((sig, getattr(self, cb)))
self.signal.connect_signals(signals)
def prev_view(self):
self.view_stack.pop()
meth, args, kw = self.view_stack.pop()
meth(*args, **kw)
def run_in_bg(self, func, callback):
"""Run func() in a thread and call callback on UI thread.