libervia-backend: sat_frontends/jp/xmlui

comparison sat_frontends/jp/xmlui_manager.py @ 3028:ab2696e34d29

Python 3 port: /!\ this is a huge commit /!\ starting from this commit, SàT is needs Python 3.6+ /!\ SàT maybe be instable or some feature may not work anymore, this will improve with time This patch port backend, bridge and frontends to Python 3. Roughly this has been done this way: - 2to3 tools has been applied (with python 3.7) - all references to python2 have been replaced with python3 (notably shebangs) - fixed files not handled by 2to3 (notably the shell script) - several manual fixes - fixed issues reported by Python 3 that where not handled in Python 2 - replaced "async" with "async_" when needed (it's a reserved word from Python 3.7) - replaced zope's "implements" with @implementer decorator - temporary hack to handle data pickled in database, as str or bytes may be returned, to be checked later - fixed hash comparison for password - removed some code which is not needed anymore with Python 3 - deactivated some code which needs to be checked (notably certificate validation) - tested with jp, fixed reported issues until some basic commands worked - ported Primitivus (after porting dependencies like urwid satext) - more manual fixes

author	Goffi <goffi@goffi.org>
date	Tue, 13 Aug 2019 19:08:41 +0200
parents	620bbcec884c
children	fee60f17ebac

comparison

equal deleted inserted replaced

-:ff5bcb12ae60
+:ab2696e34d29
 def disp(self, *args, **kwargs):
 self.host.disp(*args, **kwargs)
 class Widget(Base):
-category = u"widget"
+category = "widget"
 enabled = True
 @property
 def name(self):
 return self._xmlui_name
 if value is None:
 value = self.name
 if self.host.verbosity:
 to_disp = [
 A.FG_MAGENTA,
-u" " if elems else u"",
+" " if elems else "",
-u"({})".format(value),
+"({})".format(value),
 A.RESET,
 ]
 if elems is None:
 self.host.disp(A.color(*to_disp))
 else:
 if no_select or value in self.selected:
 yield value, label
 @property
 def inline(self):
-return u"inline" in self.style
+return "inline" in self.style
 @property
 def no_select(self):
-return u"noselect" in self.style
+return "noselect" in self.style
 class EmptyWidget(xmlui_base.EmptyWidget, Widget):
 def __init__(self, xmlui_parent):
 Widget.__init__(self, xmlui_parent)
 def show(self):
-self.host.disp(u'')
+self.host.disp('')
 class TextWidget(xmlui_base.TextWidget, ValueWidget):
-type = u"text"
+type = "text"
 def show(self):
 self.host.disp(self.value)
 class LabelWidget(xmlui_base.LabelWidget, ValueWidget):
-type = u"label"
+type = "label"
 @property
 def for_name(self):
 try:
 return self._xmlui_for_name
 except AttributeError:
 return None
-def show(self, no_lf=False, ansi=u""):
+def show(self, no_lf=False, ansi=""):
 """show label
 @param no_lf(bool): same as for [JP.disp]
 @param ansi(unicode): ansi escape code to print before label
 """
 self.disp(A.color(ansi, self.value), no_lf=no_lf)
 class JidWidget(xmlui_base.JidWidget, TextWidget):
-type = u"jid"
+type = "jid"
 class StringWidget(xmlui_base.StringWidget, InputWidget):
-type = u"string"
+type = "string"
 def show(self):
 if self.read_only or self.root.read_only:
 self.disp(self.value)
 else:
 elems = []
 self.verboseName(elems)
 if self.value:
-elems.append(_(u"(enter: {default})").format(default=self.value))
+elems.append(_("(enter: {default})").format(default=self.value))
-elems.extend([C.A_HEADER, u"> "])
+elems.extend([C.A_HEADER, "> "])
-value = raw_input(A.color(*elems).encode('utf-8'))
+value = input(A.color(*elems).encode('utf-8'))
 if value:
 #  TODO: empty value should be possible
 #       an escape key should be used for default instead of enter with empty value
 self.value = value
 class JidInputWidget(xmlui_base.JidInputWidget, StringWidget):
-type = u"jid_input"
+type = "jid_input"
 class TextBoxWidget(xmlui_base.TextWidget, StringWidget):
-type = u"textbox"
+type = "textbox"
 # TODO: use a more advanced input method
 def show(self):
 self.verboseName()
 if self.read_only or self.root.read_only:
 self.disp(self.value)
 else:
 if self.value:
-self.disp(A.color(C.A_HEADER, u"↓ current value ↓\n", A.FG_CYAN, self.value,
+self.disp(A.color(C.A_HEADER, "↓ current value ↓\n", A.FG_CYAN, self.value,
 ""))
 values = []
 while True:
 try:
 if not values:
-line = raw_input(A.color(C.A_HEADER, u"[Ctrl-D to finish]> "))
+line = input(A.color(C.A_HEADER, "[Ctrl-D to finish]> "))
 else:
-line = raw_input()
+line = input()
 values.append(line)
 except EOFError:
 break
-self.value = u'\n'.join(values).rstrip()
+self.value = '\n'.join(values).rstrip()
 class XHTMLBoxWidget(xmlui_base.XHTMLBoxWidget, StringWidget):
-type = u"xhtmlbox"
+type = "xhtmlbox"
 def show(self):
 # FIXME: we use bridge in a blocking way as permitted by python-dbus
 #        this only for now to make it simpler, it must be refactored
 #        to use async when jp will be fully async (expected for 0.8)
 self.value, C.SYNTAX_XHTML, "markdown", False, self.host.profile)
 super(XHTMLBoxWidget, self).show()
 class ListWidget(xmlui_base.ListWidget, OptionsWidget):
-type = u"list"
+type = "list"
 # TODO: handle flags, notably multi
 def show(self):
 if self.root.values_only:
 for value in self.values:
 self.verboseName()
 for idx, (value, label) in enumerate(self.options):
 elems = []
 if not self.root.read_only:
-elems.extend([C.A_SUBHEADER, unicode(idx), A.RESET, u": "])
+elems.extend([C.A_SUBHEADER, str(idx), A.RESET, ": "])
 elems.append(label)
 self.verboseName(elems, value)
 self.disp(A.color(*elems))
 if self.root.read_only:
 #  we ask use to choose an option
 choice = None
 limit_max = len(self.options) - 1
 while choice is None or choice < 0 or choice > limit_max:
-choice = raw_input(
+choice = input(
-A.color(C.A_HEADER, _(u"your choice (0-{max}): ").format(max=limit_max))
+A.color(C.A_HEADER, _("your choice (0-{max}): ").format(max=limit_max))
 )
 try:
 choice = int(choice)
 except ValueError:
 choice = None
 self.value = self.options[choice][0]
 self.disp("")
 class BoolWidget(xmlui_base.BoolWidget, InputWidget):
-type = u"bool"
+type = "bool"
 def show(self):
-disp_true = A.color(A.FG_GREEN, u"TRUE")
+disp_true = A.color(A.FG_GREEN, "TRUE")
-disp_false = A.color(A.FG_RED, u"FALSE")
+disp_false = A.color(A.FG_RED, "FALSE")
 if self.read_only or self.root.read_only:
 self.disp(disp_true if self.value else disp_false)
 else:
-self.disp(A.color(C.A_HEADER, u"0: ",
+self.disp(A.color(C.A_HEADER, "0: ",
 disp_false, A.RESET,
-u" *" if not self.value else u""))
+" *" if not self.value else ""))
-self.disp(A.color(C.A_HEADER, u"1: ",
+self.disp(A.color(C.A_HEADER, "1: ",
 disp_true, A.RESET,
-u" *" if self.value else u""))
+" *" if self.value else ""))
 choice = None
 while choice not in ("0", "1"):
-elems = [C.A_HEADER, _(u"your choice (0,1): ")]
+elems = [C.A_HEADER, _("your choice (0,1): ")]
 self.verboseName(elems)
-choice = raw_input(A.color(*elems))
+choice = input(A.color(*elems))
 self.value = bool(int(choice))
 self.disp("")
 def _xmluiGetValue(self):
 return C.boolConst(self.value)
 ## Containers ##
 class Container(Base):
-category = u"container"
+category = "container"
 def __init__(self, xmlui_parent):
 super(Container, self).__init__(xmlui_parent)
 self.children = []
 for child in self.children:
 child.show()
 class VerticalContainer(xmlui_base.VerticalContainer, Container):
-type = u"vertical"
+type = "vertical"
 class PairsContainer(xmlui_base.PairsContainer, Container):
-type = u"pairs"
+type = "pairs"
 class LabelContainer(xmlui_base.PairsContainer, Container):
-type = u"label"
+type = "label"
 def show(self):
 for child in self.children:
 no_lf = False
 # we check linked widget type
 # to see if we want the label on the same line or not
-if child.type == u"label":
+if child.type == "label":
 for_name = child.for_name
 if for_name:
 for_widget = self.root.widgets[for_name]
 wid_type = for_widget.type
 if self.root.values_only or wid_type in (
 pass
 def _launchActionCb(self, data):
 XMLUIPanel._actions -= 1
 assert XMLUIPanel._actions >= 0
-if u"xmlui" in data:
+if "xmlui" in data:
 xmlui_raw = data["xmlui"]
 xmlui = create(self.host, xmlui_raw)
 xmlui.show()
 if xmlui.submit_id:
 xmlui.onFormSubmitted()
 data,
 self.profile,
 callback=self._launchActionCb,
 errback=partial(
 self.command.errback,
-msg=_(u"can't launch XMLUI action: {}"),
+msg=_("can't launch XMLUI action: {}"),
 exit_code=C.EXIT_BRIDGE_ERRBACK,
 ),
 )

Mercurial > libervia-backend

comparison sat_frontends/jp/xmlui_manager.py @ 3028:ab2696e34d29