From 9664f6040815e0b5549ce26b0fd2d0c08ff1e683 Mon Sep 17 00:00:00 2001 From: Ryan Harper Date: Tue, 3 Nov 2015 12:44:17 -0600 Subject: [PATCH] make check: fix lint issue with signal rework Fix up flake8 issues. Signed-off-by: Ryan Harper --- subiquity/controllers/filesystem.py | 6 ++-- subiquity/signals.py | 30 +++++++++++-------- subiquity/ui/views/filesystem.py | 20 ++++++------- .../ui/views/network_configure_interface.py | 3 +- subiquity/ui/views/welcome.py | 1 - 5 files changed, 33 insertions(+), 27 deletions(-) diff --git a/subiquity/controllers/filesystem.py b/subiquity/controllers/filesystem.py index 17c4c902..1812b6e3 100644 --- a/subiquity/controllers/filesystem.py +++ b/subiquity/controllers/filesystem.py @@ -174,7 +174,8 @@ class FilesystemController(ControllerPolicy): log.info("Successfully added partition") log.debug("FS Table: {}".format(current_disk.get_fs_table())) - self.signal.emit_signal('menu:filesystem:main:show-disk-partition', disk) + self.signal.emit_signal('menu:filesystem:main:show-disk-partition', + disk) def add_disk_format_handler(self, disk, spec): log.debug('add_disk_format_handler') @@ -183,7 +184,8 @@ class FilesystemController(ControllerPolicy): log.debug('disk.freespace: {}'.format(current_disk.freespace)) current_disk.format_device(spec['fstype'], spec['mountpoint']) log.debug("FS Table: {}".format(current_disk.get_fs_table())) - self.signal.emit_signal('menu:filesystem:main:show-disk-partition', disk) + self.signal.emit_signal('menu:filesystem:main:show-disk-partition', + disk) def connect_iscsi_disk(self, *args, **kwargs): # title = ("Disk and filesystem setup") diff --git a/subiquity/signals.py b/subiquity/signals.py index ee060ff7..9a28447b 100644 --- a/subiquity/signals.py +++ b/subiquity/signals.py @@ -39,10 +39,10 @@ class Signal: urwid.register_signal(Signal, signals) def prev_signal(self): - log.debug('prev_signal: Signal Stack size: {}'.format(len(self.signal_stack))) + log.debug('prev_signal: before: ' + 'size={} stack={}'.format(len(self.signal_stack), + self.signal_stack)) if len(self.signal_stack) > 1: - log.debug("prev_signal: before: size={} stack={}".format(len(self.signal_stack), - self.signal_stack)) (current_name, *_) = self.signal_stack.pop() (prev_name, args, kwargs) = self.signal_stack.pop() log.debug('current_name={}'.format(current_name)) @@ -53,33 +53,37 @@ class Signal: (prev_name, args, kwargs) = self.signal_stack.pop() log.debug('previous={}'.format(prev_name)) - log.debug("prev_signal: after: size={} stack={}".format(len(self.signal_stack), - self.signal_stack)) + log.debug('prev_signal: after: ' + 'size={} stack={}'.format(len(self.signal_stack), + self.signal_stack)) - log.debug("PrevEmitter: {}, {}, {}".format(prev_name, args, kwargs)) + log.debug("PrevEmitter: {}, {}, {}".format(prev_name, args, + kwargs)) self.emit_signal(prev_name, *args, **kwargs) else: + log.debug('stack empty: emitting menu:welcome:main') # FIXME: this should be set by common - log.debug('WARK: nothing left') urwid.emit_signal(self, 'menu:welcome:main') def emit_signal(self, name, *args, **kwargs): log.debug("Emitter: {}, {}, {}".format(name, args, kwargs)) if name.startswith("menu:"): - log.debug(" emit: before: size={} stack={}".format(len(self.signal_stack), - self.signal_stack)) - # only stack *menu* signals, drop signals if we've already visited - # this level + log.debug(" emit: before: " + "size={} stack={}".format(len(self.signal_stack), + self.signal_stack)) + # only stack *menu* signals, drop signals if we've already + # visited this level match = [s for s in self.signal_stack if s[0] == name] if len(match) > 0: index = self.signal_stack.index(match.pop()) log.debug('Already visited {}, trimming stack'.format(name)) - self.signal_stack = self.signal_stack[0:index+1] + self.signal_stack = self.signal_stack[0:index + 1] else: log.debug('New menu for stack: {}'.format(name)) self.signal_stack.append((name, args, kwargs)) - log.debug(" emit: after: size={} stack={}".format(len(self.signal_stack), + log.debug(" emit: after: " + "size={} stack={}".format(len(self.signal_stack), self.signal_stack)) urwid.emit_signal(self, name, *args, **kwargs) diff --git a/subiquity/ui/views/filesystem.py b/subiquity/ui/views/filesystem.py index eaf4f4c6..705b9755 100644 --- a/subiquity/ui/views/filesystem.py +++ b/subiquity/ui/views/filesystem.py @@ -21,16 +21,15 @@ configuration. """ import logging import re -from urwid import (WidgetWrap, ListBox, Pile, BoxAdapter, - Text, Columns) +from urwid import (ListBox, Pile, BoxAdapter, Text, Columns) from subiquity.ui.lists import SimpleList from subiquity.ui.buttons import (done_btn, reset_btn, cancel_btn, menu_btn) from subiquity.ui.utils import Padding, Color -from subiquity.ui.interactive import (StringEditor, IntegerEditor, Selector, - MountEditor) +from subiquity.ui.interactive import (StringEditor, IntegerEditor, + Selector, MountEditor) from subiquity.models.filesystem import (_humanize_size, _dehumanize_size, HUMAN_UNITS) @@ -81,7 +80,7 @@ class DiskInfoView(ViewPolicy): return None return super().keypress(size, key) - + def done(self, result): ''' Return to FilesystemView ''' self.signal.prev_signal() @@ -460,8 +459,9 @@ class DiskPartitionView(ViewPolicy): def create_swap(self, result): log.debug('create_swap: result={}'.format(result)) - self.signal.emit_signal('menu:filesystem:main:create-swap-entire-device', - self.selected_disk) + self.signal.emit_signal( + 'menu:filesystem:main:create-swap-entire-device', + self.selected_disk) def done(self, result): ''' Return to FilesystemView ''' @@ -600,9 +600,9 @@ class FilesystemView(ViewPolicy): for opt, sig, _ in self.model.get_menu(): if len(avail_disks) > 1: opts.append(Color.menu_button( - menu_btn(label=opt, - on_press=self.on_fs_menu_press), - focus_map='menu_button focus')) + menu_btn(label=opt, + on_press=self.on_fs_menu_press), + focus_map='menu_button focus')) return Pile(opts) def on_fs_menu_press(self, result): diff --git a/subiquity/ui/views/network_configure_interface.py b/subiquity/ui/views/network_configure_interface.py index 3f9eb0b2..88d3be2a 100644 --- a/subiquity/ui/views/network_configure_interface.py +++ b/subiquity/ui/views/network_configure_interface.py @@ -59,7 +59,8 @@ class NetworkConfigureInterfaceView(ViewPolicy): return Pile(buttons) def show_ipv4_configuration(self, btn): - self.signal.emit_signal('menu:network:main:configure-ipv4-interface', self.iface) + self.signal.emit_signal( + 'menu:network:main:configure-ipv4-interface', self.iface) def done(self, result): self.signal.prev_signal() diff --git a/subiquity/ui/views/welcome.py b/subiquity/ui/views/welcome.py index d5788227..68e1f5c5 100644 --- a/subiquity/ui/views/welcome.py +++ b/subiquity/ui/views/welcome.py @@ -62,7 +62,6 @@ class WelcomeView(ViewPolicy): log.debug('calling installpath') self.signal.emit_signal('menu:installpath:main') - def cancel(self, button): raise SystemExit("No language selected, exiting as there are no " "more previous controllers to render.")