make check: fix lint issue with signal rework
Fix up flake8 issues. Signed-off-by: Ryan Harper <ryan.harper@canonical.com>
This commit is contained in:
parent
1f7383a0f5
commit
9664f60408
|
@ -174,7 +174,8 @@ class FilesystemController(ControllerPolicy):
|
||||||
log.info("Successfully added partition")
|
log.info("Successfully added partition")
|
||||||
|
|
||||||
log.debug("FS Table: {}".format(current_disk.get_fs_table()))
|
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):
|
def add_disk_format_handler(self, disk, spec):
|
||||||
log.debug('add_disk_format_handler')
|
log.debug('add_disk_format_handler')
|
||||||
|
@ -183,7 +184,8 @@ class FilesystemController(ControllerPolicy):
|
||||||
log.debug('disk.freespace: {}'.format(current_disk.freespace))
|
log.debug('disk.freespace: {}'.format(current_disk.freespace))
|
||||||
current_disk.format_device(spec['fstype'], spec['mountpoint'])
|
current_disk.format_device(spec['fstype'], spec['mountpoint'])
|
||||||
log.debug("FS Table: {}".format(current_disk.get_fs_table()))
|
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):
|
def connect_iscsi_disk(self, *args, **kwargs):
|
||||||
# title = ("Disk and filesystem setup")
|
# title = ("Disk and filesystem setup")
|
||||||
|
|
|
@ -39,10 +39,10 @@ class Signal:
|
||||||
urwid.register_signal(Signal, signals)
|
urwid.register_signal(Signal, signals)
|
||||||
|
|
||||||
def prev_signal(self):
|
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:
|
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()
|
(current_name, *_) = self.signal_stack.pop()
|
||||||
(prev_name, args, kwargs) = self.signal_stack.pop()
|
(prev_name, args, kwargs) = self.signal_stack.pop()
|
||||||
log.debug('current_name={}'.format(current_name))
|
log.debug('current_name={}'.format(current_name))
|
||||||
|
@ -53,33 +53,37 @@ class Signal:
|
||||||
(prev_name, args, kwargs) = self.signal_stack.pop()
|
(prev_name, args, kwargs) = self.signal_stack.pop()
|
||||||
log.debug('previous={}'.format(prev_name))
|
log.debug('previous={}'.format(prev_name))
|
||||||
|
|
||||||
log.debug("prev_signal: after: size={} stack={}".format(len(self.signal_stack),
|
log.debug('prev_signal: after: '
|
||||||
self.signal_stack))
|
'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)
|
self.emit_signal(prev_name, *args, **kwargs)
|
||||||
else:
|
else:
|
||||||
|
log.debug('stack empty: emitting menu:welcome:main')
|
||||||
# FIXME: this should be set by common
|
# FIXME: this should be set by common
|
||||||
log.debug('WARK: nothing left')
|
|
||||||
urwid.emit_signal(self, 'menu:welcome:main')
|
urwid.emit_signal(self, 'menu:welcome:main')
|
||||||
|
|
||||||
def emit_signal(self, name, *args, **kwargs):
|
def emit_signal(self, name, *args, **kwargs):
|
||||||
log.debug("Emitter: {}, {}, {}".format(name, args, kwargs))
|
log.debug("Emitter: {}, {}, {}".format(name, args, kwargs))
|
||||||
if name.startswith("menu:"):
|
if name.startswith("menu:"):
|
||||||
log.debug(" emit: before: size={} stack={}".format(len(self.signal_stack),
|
log.debug(" emit: before: "
|
||||||
self.signal_stack))
|
"size={} stack={}".format(len(self.signal_stack),
|
||||||
# only stack *menu* signals, drop signals if we've already visited
|
self.signal_stack))
|
||||||
# this level
|
# 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]
|
match = [s for s in self.signal_stack if s[0] == name]
|
||||||
if len(match) > 0:
|
if len(match) > 0:
|
||||||
index = self.signal_stack.index(match.pop())
|
index = self.signal_stack.index(match.pop())
|
||||||
log.debug('Already visited {}, trimming stack'.format(name))
|
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:
|
else:
|
||||||
log.debug('New menu for stack: {}'.format(name))
|
log.debug('New menu for stack: {}'.format(name))
|
||||||
self.signal_stack.append((name, args, kwargs))
|
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))
|
self.signal_stack))
|
||||||
urwid.emit_signal(self, name, *args, **kwargs)
|
urwid.emit_signal(self, name, *args, **kwargs)
|
||||||
|
|
||||||
|
|
|
@ -21,16 +21,15 @@ configuration.
|
||||||
"""
|
"""
|
||||||
import logging
|
import logging
|
||||||
import re
|
import re
|
||||||
from urwid import (WidgetWrap, ListBox, Pile, BoxAdapter,
|
from urwid import (ListBox, Pile, BoxAdapter, Text, Columns)
|
||||||
Text, Columns)
|
|
||||||
from subiquity.ui.lists import SimpleList
|
from subiquity.ui.lists import SimpleList
|
||||||
from subiquity.ui.buttons import (done_btn,
|
from subiquity.ui.buttons import (done_btn,
|
||||||
reset_btn,
|
reset_btn,
|
||||||
cancel_btn,
|
cancel_btn,
|
||||||
menu_btn)
|
menu_btn)
|
||||||
from subiquity.ui.utils import Padding, Color
|
from subiquity.ui.utils import Padding, Color
|
||||||
from subiquity.ui.interactive import (StringEditor, IntegerEditor, Selector,
|
from subiquity.ui.interactive import (StringEditor, IntegerEditor,
|
||||||
MountEditor)
|
Selector, MountEditor)
|
||||||
from subiquity.models.filesystem import (_humanize_size,
|
from subiquity.models.filesystem import (_humanize_size,
|
||||||
_dehumanize_size,
|
_dehumanize_size,
|
||||||
HUMAN_UNITS)
|
HUMAN_UNITS)
|
||||||
|
@ -460,8 +459,9 @@ class DiskPartitionView(ViewPolicy):
|
||||||
|
|
||||||
def create_swap(self, result):
|
def create_swap(self, result):
|
||||||
log.debug('create_swap: result={}'.format(result))
|
log.debug('create_swap: result={}'.format(result))
|
||||||
self.signal.emit_signal('menu:filesystem:main:create-swap-entire-device',
|
self.signal.emit_signal(
|
||||||
self.selected_disk)
|
'menu:filesystem:main:create-swap-entire-device',
|
||||||
|
self.selected_disk)
|
||||||
|
|
||||||
def done(self, result):
|
def done(self, result):
|
||||||
''' Return to FilesystemView '''
|
''' Return to FilesystemView '''
|
||||||
|
@ -600,9 +600,9 @@ class FilesystemView(ViewPolicy):
|
||||||
for opt, sig, _ in self.model.get_menu():
|
for opt, sig, _ in self.model.get_menu():
|
||||||
if len(avail_disks) > 1:
|
if len(avail_disks) > 1:
|
||||||
opts.append(Color.menu_button(
|
opts.append(Color.menu_button(
|
||||||
menu_btn(label=opt,
|
menu_btn(label=opt,
|
||||||
on_press=self.on_fs_menu_press),
|
on_press=self.on_fs_menu_press),
|
||||||
focus_map='menu_button focus'))
|
focus_map='menu_button focus'))
|
||||||
return Pile(opts)
|
return Pile(opts)
|
||||||
|
|
||||||
def on_fs_menu_press(self, result):
|
def on_fs_menu_press(self, result):
|
||||||
|
|
|
@ -59,7 +59,8 @@ class NetworkConfigureInterfaceView(ViewPolicy):
|
||||||
return Pile(buttons)
|
return Pile(buttons)
|
||||||
|
|
||||||
def show_ipv4_configuration(self, btn):
|
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):
|
def done(self, result):
|
||||||
self.signal.prev_signal()
|
self.signal.prev_signal()
|
||||||
|
|
|
@ -62,7 +62,6 @@ class WelcomeView(ViewPolicy):
|
||||||
log.debug('calling installpath')
|
log.debug('calling installpath')
|
||||||
self.signal.emit_signal('menu:installpath:main')
|
self.signal.emit_signal('menu:installpath:main')
|
||||||
|
|
||||||
|
|
||||||
def cancel(self, button):
|
def cancel(self, button):
|
||||||
raise SystemExit("No language selected, exiting as there are no "
|
raise SystemExit("No language selected, exiting as there are no "
|
||||||
"more previous controllers to render.")
|
"more previous controllers to render.")
|
||||||
|
|
Loading…
Reference in New Issue