--- a/sat_frontends/primitivus/xmlui.py	Wed Jun 27 07:51:29 2018 +0200
+++ b/sat_frontends/primitivus/xmlui.py	Wed Jun 27 20:14:46 2018 +0200
@@ -24,6 +24,7 @@
 from urwid_satext import sat_widgets
 from urwid_satext import files_management
 from sat.core.log import getLogger
+
 log = getLogger(__name__)
 from sat_frontends.primitivus.constants import Const as C
 from sat_frontends.primitivus.widget import PrimitivusWidget
@@ -39,25 +40,22 @@
 
     def _xmluiOnChange(self, callback):
         """ Call callback with widget as only argument """
-        urwid.connect_signal(self, 'change', self._event_callback, callback)
+        urwid.connect_signal(self, "change", self._event_callback, callback)
 
 
 class PrimitivusEmptyWidget(xmlui.EmptyWidget, urwid.Text):
-
     def __init__(self, _xmlui_parent):
-        urwid.Text.__init__(self, '')
+        urwid.Text.__init__(self, "")
 
 
 class PrimitivusTextWidget(xmlui.TextWidget, urwid.Text):
-
     def __init__(self, _xmlui_parent, value, read_only=False):
         urwid.Text.__init__(self, value)
 
 
 class PrimitivusLabelWidget(xmlui.LabelWidget, PrimitivusTextWidget):
-
     def __init__(self, _xmlui_parent, value):
-        super(PrimitivusLabelWidget, self).__init__(_xmlui_parent, value+": ")
+        super(PrimitivusLabelWidget, self).__init__(_xmlui_parent, value + ": ")
 
 
 class PrimitivusJidWidget(xmlui.JidWidget, PrimitivusTextWidget):
@@ -65,27 +63,27 @@
 
 
 class PrimitivusDividerWidget(xmlui.DividerWidget, urwid.Divider):
-
-    def __init__(self, _xmlui_parent, style='line'):
-        if style == 'line':
-            div_char = u'─'
-        elif style == 'dot':
-            div_char = u'·'
-        elif style == 'dash':
-            div_char = u'-'
-        elif style == 'plain':
-            div_char = u'█'
-        elif style == 'blank':
-            div_char = ' '
+    def __init__(self, _xmlui_parent, style="line"):
+        if style == "line":
+            div_char = u"─"
+        elif style == "dot":
+            div_char = u"·"
+        elif style == "dash":
+            div_char = u"-"
+        elif style == "plain":
+            div_char = u"█"
+        elif style == "blank":
+            div_char = " "
         else:
             log.warning(_("Unknown div_char"))
-            div_char = u'─'
+            div_char = u"─"
 
         urwid.Divider.__init__(self, div_char)
 
 
-class PrimitivusStringWidget(xmlui.StringWidget, sat_widgets.AdvancedEdit, PrimitivusEvents):
-
+class PrimitivusStringWidget(
+    xmlui.StringWidget, sat_widgets.AdvancedEdit, PrimitivusEvents
+):
     def __init__(self, _xmlui_parent, value, read_only=False):
         sat_widgets.AdvancedEdit.__init__(self, edit_text=value)
         self.read_only = read_only
@@ -106,8 +104,9 @@
     pass
 
 
-class PrimitivusPasswordWidget(xmlui.PasswordWidget, sat_widgets.Password, PrimitivusEvents):
-
+class PrimitivusPasswordWidget(
+    xmlui.PasswordWidget, sat_widgets.Password, PrimitivusEvents
+):
     def __init__(self, _xmlui_parent, value, read_only=False):
         sat_widgets.Password.__init__(self, edit_text=value)
         self.read_only = read_only
@@ -124,8 +123,9 @@
         return self.get_edit_text()
 
 
-class PrimitivusTextBoxWidget(xmlui.TextBoxWidget, sat_widgets.AdvancedEdit, PrimitivusEvents):
-
+class PrimitivusTextBoxWidget(
+    xmlui.TextBoxWidget, sat_widgets.AdvancedEdit, PrimitivusEvents
+):
     def __init__(self, _xmlui_parent, value, read_only=False):
         sat_widgets.AdvancedEdit.__init__(self, edit_text=value, multiline=True)
         self.read_only = read_only
@@ -143,9 +143,8 @@
 
 
 class PrimitivusBoolWidget(xmlui.BoolWidget, urwid.CheckBox, PrimitivusEvents):
-
     def __init__(self, _xmlui_parent, state, read_only=False):
-        urwid.CheckBox.__init__(self, '', state=state)
+        urwid.CheckBox.__init__(self, "", state=state)
         self.read_only = read_only
 
     def selectable(self):
@@ -161,7 +160,6 @@
 
 
 class PrimitivusIntWidget(xmlui.IntWidget, sat_widgets.AdvancedEdit, PrimitivusEvents):
-
     def __init__(self, _xmlui_parent, value, read_only=False):
         sat_widgets.AdvancedEdit.__init__(self, edit_text=value)
         self.read_only = read_only
@@ -178,17 +176,17 @@
         return self.get_edit_text()
 
 
-class PrimitivusButtonWidget(xmlui.ButtonWidget, sat_widgets.CustomButton, PrimitivusEvents):
-
+class PrimitivusButtonWidget(
+    xmlui.ButtonWidget, sat_widgets.CustomButton, PrimitivusEvents
+):
     def __init__(self, _xmlui_parent, value, click_callback):
         sat_widgets.CustomButton.__init__(self, value, on_press=click_callback)
 
     def _xmluiOnClick(self, callback):
-            urwid.connect_signal(self, 'click', callback)
+        urwid.connect_signal(self, "click", callback)
 
 
 class PrimitivusListWidget(xmlui.ListWidget, sat_widgets.List, PrimitivusEvents):
-
     def __init__(self, _xmlui_parent, options, selected, flags):
         sat_widgets.List.__init__(self, options=options, style=flags)
         self._xmluiSelectValues(selected)
@@ -217,13 +215,18 @@
                     selected.append(value)
             self._xmluiSelectValues(selected)
 
+
 class PrimitivusJidsListWidget(xmlui.ListWidget, sat_widgets.List, PrimitivusEvents):
-
     def __init__(self, _xmlui_parent, jids, styles):
-        sat_widgets.List.__init__(self, options=jids+[''], # the empty field is here to add new jids if needed
-                                  option_type=lambda txt, align: sat_widgets.AdvancedEdit(edit_text=txt, align=align),
-                                  on_change=self._onChange)
-        self.delete=0
+        sat_widgets.List.__init__(
+            self,
+            options=jids + [""],  # the empty field is here to add new jids if needed
+            option_type=lambda txt, align: sat_widgets.AdvancedEdit(
+                edit_text=txt, align=align
+            ),
+            on_change=self._onChange,
+        )
+        self.delete = 0
 
     def _onChange(self, list_widget, jid_widget=None, text=None):
         if jid_widget is not None:
@@ -239,13 +242,16 @@
         return [jid_ for jid_ in self.getAllValues() if jid_]
 
 
-class PrimitivusAdvancedListContainer(xmlui.AdvancedListContainer, sat_widgets.TableContainer, PrimitivusEvents):
-
-    def __init__(self, _xmlui_parent, columns, selectable='no'):
-        options = {'ADAPT':()}
-        if selectable != 'no':
-            options['HIGHLIGHT'] = ()
-        sat_widgets.TableContainer.__init__(self, columns=columns, options=options, row_selectable = selectable!='no')
+class PrimitivusAdvancedListContainer(
+    xmlui.AdvancedListContainer, sat_widgets.TableContainer, PrimitivusEvents
+):
+    def __init__(self, _xmlui_parent, columns, selectable="no"):
+        options = {"ADAPT": ()}
+        if selectable != "no":
+            options["HIGHLIGHT"] = ()
+        sat_widgets.TableContainer.__init__(
+            self, columns=columns, options=options, row_selectable=selectable != "no"
+        )
 
     def _xmluiAppend(self, widget):
         self.addWidget(widget)
@@ -261,21 +267,20 @@
 
     def _xmluiOnSelect(self, callback):
         """ Call callback with widget as only argument """
-        urwid.connect_signal(self, 'click', self._event_callback, callback)
+        urwid.connect_signal(self, "click", self._event_callback, callback)
 
 
 class PrimitivusPairsContainer(xmlui.PairsContainer, sat_widgets.TableContainer):
-
     def __init__(self, _xmlui_parent):
-        options = {'ADAPT':(0,), 'HIGHLIGHT':(0,)}
-        if self._xmlui_main.type == 'param':
-            options['FOCUS_ATTR'] = 'param_selected'
+        options = {"ADAPT": (0,), "HIGHLIGHT": (0,)}
+        if self._xmlui_main.type == "param":
+            options["FOCUS_ATTR"] = "param_selected"
         sat_widgets.TableContainer.__init__(self, columns=2, options=options)
 
     def _xmluiAppend(self, widget):
         if isinstance(widget, PrimitivusEmptyWidget):
             # we don't want highlight on empty widgets
-            widget = urwid.AttrMap(widget, 'default')
+            widget = urwid.AttrMap(widget, "default")
         self.addWidget(widget)
 
 
@@ -284,7 +289,6 @@
 
 
 class PrimitivusTabsContainer(xmlui.TabsContainer, sat_widgets.TabsContainer):
-
     def __init__(self, _xmlui_parent):
         sat_widgets.TabsContainer.__init__(self)
 
@@ -305,7 +309,7 @@
         self._last_size = None
 
     def _xmluiAppend(self, widget):
-        if 'flow' not in widget.sizing():
+        if "flow" not in widget.sizing():
             widget = urwid.BoxAdapter(widget, self.BOX_HEIGHT)
         self.body.append(widget)
 
@@ -324,7 +328,6 @@
 
 
 class PrimitivusDialog(object):
-
     def __init__(self, _xmlui_parent):
         self.host = _xmlui_parent.host
 
@@ -336,11 +339,12 @@
 
 
 class PrimitivusMessageDialog(PrimitivusDialog, xmlui.MessageDialog, sat_widgets.Alert):
-
     def __init__(self, _xmlui_parent, title, message, level):
         PrimitivusDialog.__init__(self, _xmlui_parent)
         xmlui.MessageDialog.__init__(self, _xmlui_parent)
-        sat_widgets.Alert.__init__(self, title, message, ok_cb=lambda dummy: self._xmluiClose())
+        sat_widgets.Alert.__init__(
+            self, title, message, ok_cb=lambda dummy: self._xmluiClose()
+        )
 
 
 class PrimitivusNoteDialog(xmlui.NoteDialog, PrimitivusMessageDialog):
@@ -348,41 +352,51 @@
     pass
 
 
-class PrimitivusConfirmDialog(PrimitivusDialog, xmlui.ConfirmDialog, sat_widgets.ConfirmDialog):
-
+class PrimitivusConfirmDialog(
+    PrimitivusDialog, xmlui.ConfirmDialog, sat_widgets.ConfirmDialog
+):
     def __init__(self, _xmlui_parent, title, message, level, buttons_set):
         PrimitivusDialog.__init__(self, _xmlui_parent)
         xmlui.ConfirmDialog.__init__(self, _xmlui_parent)
-        sat_widgets.ConfirmDialog.__init__(self, title, message, no_cb=lambda dummy: self._xmluiCancelled(), yes_cb=lambda dummy: self._xmluiValidated())
+        sat_widgets.ConfirmDialog.__init__(
+            self,
+            title,
+            message,
+            no_cb=lambda dummy: self._xmluiCancelled(),
+            yes_cb=lambda dummy: self._xmluiValidated(),
+        )
 
 
-class PrimitivusFileDialog(PrimitivusDialog, xmlui.FileDialog, files_management.FileDialog):
-
+class PrimitivusFileDialog(
+    PrimitivusDialog, xmlui.FileDialog, files_management.FileDialog
+):
     def __init__(self, _xmlui_parent, title, message, level, filetype):
         # TODO: message is not managed yet
         PrimitivusDialog.__init__(self, _xmlui_parent)
         xmlui.FileDialog.__init__(self, _xmlui_parent)
         style = []
         if filetype == C.XMLUI_DATA_FILETYPE_DIR:
-            style.append('dir')
-        files_management.FileDialog.__init__(self,
-            ok_cb=lambda path: self._xmluiValidated({'path': path}),
+            style.append("dir")
+        files_management.FileDialog.__init__(
+            self,
+            ok_cb=lambda path: self._xmluiValidated({"path": path}),
             cancel_cb=lambda dummy: self._xmluiCancelled(),
             message=message,
             title=title,
-            style=style)
+            style=style,
+        )
 
 
 class GenericFactory(object):
-
     def __getattr__(self, attr):
         if attr.startswith("create"):
-            cls = globals()["Primitivus" + attr[6:]] # XXX: we prefix with "Primitivus" to work around an Urwid bug, WidgetMeta in Urwid don't manage multiple inheritance with same names
+            cls = globals()[
+                "Primitivus" + attr[6:]
+            ]  # XXX: we prefix with "Primitivus" to work around an Urwid bug, WidgetMeta in Urwid don't manage multiple inheritance with same names
             return cls
 
 
 class WidgetFactory(GenericFactory):
-
     def __getattr__(self, attr):
         if attr.startswith("create"):
             cls = GenericFactory.__getattr__(self, attr)
@@ -393,48 +407,66 @@
 class XMLUIPanel(xmlui.XMLUIPanel, PrimitivusWidget):
     widget_factory = WidgetFactory()
 
-    def __init__(self, host, parsed_xml, title=None, flags=None, callback=None, ignore=None, whitelist=None, profile=C.PROF_KEY_NONE):
+    def __init__(
+        self,
+        host,
+        parsed_xml,
+        title=None,
+        flags=None,
+        callback=None,
+        ignore=None,
+        whitelist=None,
+        profile=C.PROF_KEY_NONE,
+    ):
         self.widget_factory._xmlui_main = self
         self._dest = None
-        xmlui.XMLUIPanel.__init__(self,
-                                  host,
-                                  parsed_xml,
-                                  title = title,
-                                  flags = flags,
-                                  callback = callback,
-                                  ignore = ignore,
-                                  profile = profile)
+        xmlui.XMLUIPanel.__init__(
+            self,
+            host,
+            parsed_xml,
+            title=title,
+            flags=flags,
+            callback=callback,
+            ignore=ignore,
+            profile=profile,
+        )
         PrimitivusWidget.__init__(self, self.main_cont, self.xmlui_title)
 
     def constructUI(self, parsed_dom):
         def postTreat():
             assert self.main_cont.body
 
-            if self.type in ('form', 'popup'):
+            if self.type in ("form", "popup"):
                 buttons = []
-                if self.type == 'form':
-                    buttons.append(urwid.Button(_('Submit'), self.onFormSubmitted))
-                    if not 'NO_CANCEL' in self.flags:
-                        buttons.append(urwid.Button(_('Cancel'), self.onFormCancelled))
+                if self.type == "form":
+                    buttons.append(urwid.Button(_("Submit"), self.onFormSubmitted))
+                    if not "NO_CANCEL" in self.flags:
+                        buttons.append(urwid.Button(_("Cancel"), self.onFormCancelled))
                 else:
-                    buttons.append(urwid.Button(_('OK'), on_press=lambda dummy: self._xmluiClose()))
+                    buttons.append(
+                        urwid.Button(_("OK"), on_press=lambda dummy: self._xmluiClose())
+                    )
                 max_len = max([len(button.get_label()) for button in buttons])
-                grid_wid = urwid.GridFlow(buttons, max_len + 4, 1, 0, 'center')
+                grid_wid = urwid.GridFlow(buttons, max_len + 4, 1, 0, "center")
                 self.main_cont.body.append(grid_wid)
-            elif self.type == 'param':
+            elif self.type == "param":
                 tabs_cont = self.main_cont.body[0].base_widget
-                assert isinstance(tabs_cont,sat_widgets.TabsContainer)
+                assert isinstance(tabs_cont, sat_widgets.TabsContainer)
                 buttons = []
-                buttons.append(sat_widgets.CustomButton(_('Save'),self.onSaveParams))
-                buttons.append(sat_widgets.CustomButton(_('Cancel'),lambda x:self.host.removeWindow()))
+                buttons.append(sat_widgets.CustomButton(_("Save"), self.onSaveParams))
+                buttons.append(
+                    sat_widgets.CustomButton(
+                        _("Cancel"), lambda x: self.host.removeWindow()
+                    )
+                )
                 max_len = max([button.getSize() for button in buttons])
-                grid_wid = urwid.GridFlow(buttons,max_len,1,0,'center')
+                grid_wid = urwid.GridFlow(buttons, max_len, 1, 0, "center")
                 tabs_cont.addFooter(grid_wid)
 
         xmlui.XMLUIPanel.constructUI(self, parsed_dom, postTreat)
         urwid.WidgetWrap.__init__(self, self.main_cont)
 
-    def show(self, show_type=None, valign='middle'):
+    def show(self, show_type=None, valign="middle"):
         """Show the constructed UI
         @param show_type: how to show the UI:
             - None (follow XMLUI's recommendation)
@@ -445,30 +477,32 @@
 
         """
         if show_type is None:
-            if self.type in ('window', 'param'):
-                show_type = 'window'
-            elif self.type in ('popup', 'form'):
-                show_type = 'popup'
+            if self.type in ("window", "param"):
+                show_type = "window"
+            elif self.type in ("popup", "form"):
+                show_type = "popup"
 
-        if show_type not in ('popup', 'window'):
-            raise ValueError('Invalid show_type [%s]' % show_type)
+        if show_type not in ("popup", "window"):
+            raise ValueError("Invalid show_type [%s]" % show_type)
 
         self._dest = show_type
-        if show_type == 'popup':
+        if show_type == "popup":
             self.host.showPopUp(self, valign=valign)
-        elif show_type == 'window':
+        elif show_type == "window":
             self.host.newWidget(self)
         else:
-           assert False
+            assert False
         self.host.redraw()
 
     def _xmluiClose(self):
-        if self._dest == 'window':
+        if self._dest == "window":
             self.host.removeWindow()
-        elif self._dest == 'popup':
+        elif self._dest == "popup":
             self.host.removePopUp(self)
         else:
-            raise exceptions.InternalError("self._dest unknown, are you sure you have called XMLUI.show ?")
+            raise exceptions.InternalError(
+                "self._dest unknown, are you sure you have called XMLUI.show ?"
+            )
 
 
 class XMLUIDialog(xmlui.XMLUIDialog):