libervia-backend: sat_frontends/jp/cmd

comparison sat_frontends/jp/cmd_ticket.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	003b8b4b56a7
children	fee60f17ebac

comparison

equal deleted inserted replaced

-:ff5bcb12ae60
+:ab2696e34d29
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-import base
+from . import base
 from sat.core.i18n import _
 from sat_frontends.jp import common
 from sat_frontends.jp.constants import Const as C
 from functools import partial
 import json
 import os
 __commands__ = ["Ticket"]
-FIELDS_MAP = u"mapping"
+FIELDS_MAP = "mapping"
 class Get(base.CommandBase):
 def __init__(self, host):
 base.CommandBase.__init__(
 host,
 "get",
 use_verbose=True,
 use_pubsub=True,
 pubsub_flags={C.MULTI_ITEMS},
-pubsub_defaults={u"service": _(u"auto"), u"node": _(u"auto")},
+pubsub_defaults={"service": _("auto"), "node": _("auto")},
 use_output=C.OUTPUT_LIST_XMLUI,
-help=_(u"get tickets"),
+help=_("get tickets"),
 )
 self.need_loop = True
 def add_parser_options(self):
 pass
 self.host.bridge.ticketsGet(
 self.args.service,
 self.args.node,
 self.args.max,
 self.args.items,
-u"",
+"",
 self.getPubsubExtra(),
 self.profile,
 callback=self.ticketsGetCb,
 errback=partial(
 self.errback,
-msg=_(u"can't get tickets: {}"),
+msg=_("can't get tickets: {}"),
 exit_code=C.EXIT_BRIDGE_ERRBACK,
 ),
 )
 def start(self):
 def __init__(self, host):
 super(Import, self).__init__(
 host,
 "import",
 use_progress=True,
-help=_(u"import tickets from external software/dataset"),
+help=_("import tickets from external software/dataset"),
 )
 self.need_loop = True
 def add_parser_options(self):
 self.parser.add_argument(
 "importer",
-type=base.unicode_decoder,
 nargs="?",
-help=_(u"importer name, nothing to display importers list"),
+help=_("importer name, nothing to display importers list"),
 )
 self.parser.add_argument(
 "-o",
 "--option",
 action="append",
 nargs=2,
 default=[],
-metavar=(u"NAME", u"VALUE"),
+metavar=("NAME", "VALUE"),
-help=_(u"importer specific options (see importer description)"),
+help=_("importer specific options (see importer description)"),
 )
 self.parser.add_argument(
 "-m",
 "--map",
 action="append",
 nargs=2,
 default=[],
-metavar=(u"IMPORTED_FIELD", u"DEST_FIELD"),
+metavar=("IMPORTED_FIELD", "DEST_FIELD"),
 help=_(
-u"specified field in import data will be put in dest field (default: use same field name, or ignore if it doesn't exist)"
+"specified field in import data will be put in dest field (default: use same field name, or ignore if it doesn't exist)"
 ),
 )
 self.parser.add_argument(
 "-s",
 "--service",
-type=base.unicode_decoder,
+default="",
-default=u"",
+metavar="PUBSUB_SERVICE",
-metavar=u"PUBSUB_SERVICE",
+help=_("PubSub service where the items must be uploaded (default: server)"),
-help=_(u"PubSub service where the items must be uploaded (default: server)"),
 )
 self.parser.add_argument(
 "-n",
 "--node",
-type=base.unicode_decoder,
+default="",
-default=u"",
+metavar="PUBSUB_NODE",
-metavar=u"PUBSUB_NODE",
 help=_(
-u"PubSub node where the items must be uploaded (default: tickets' defaults)"
+"PubSub node where the items must be uploaded (default: tickets' defaults)"
 ),
 )
 self.parser.add_argument(
 "location",
-type=base.unicode_decoder,
 nargs="?",
 help=_(
-u"importer data location (see importer description), nothing to show importer description"
+"importer data location (see importer description), nothing to show importer description"
 ),
 )
 def onProgressStarted(self, metadata):
-self.disp(_(u"Tickets upload started"), 2)
+self.disp(_("Tickets upload started"), 2)
 def onProgressFinished(self, metadata):
-self.disp(_(u"Tickets uploaded successfully"), 2)
+self.disp(_("Tickets uploaded successfully"), 2)
 def onProgressError(self, error_msg):
-self.disp(_(u"Error while uploading tickets: {}").format(error_msg), error=True)
+self.disp(_("Error while uploading tickets: {}").format(error_msg), error=True)
 def error(self, failure):
 self.disp(
 _("Error while trying to upload tickets: {reason}").format(reason=failure),
 error=True,
 if self.args.location is None:
 for name in ("option", "service", "node"):
 if getattr(self.args, name):
 self.parser.error(
 _(
-u"{name} argument can't be used without location argument"
+"{name} argument can't be used without location argument"
 ).format(name=name)
 )
 if self.args.importer is None:
 self.disp(
-u"\n".join(
+"\n".join(
 [
-u"{}: {}".format(name, desc)
+"{}: {}".format(name, desc)
 for name, desc in self.host.bridge.ticketsImportList()
 ]
 )
 )
 else:
 try:
 short_desc, long_desc = self.host.bridge.ticketsImportDesc(
 self.args.importer
 )
 except Exception as e:
-msg = [l for l in unicode(e).split("\n") if l][
+msg = [l for l in str(e).split("\n") if l][
 -1
 ]  # we only keep the last line
 self.disp(msg)
 self.host.quit(1)
 else:
 self.disp(
-u"{name}: {short_desc}\n\n{long_desc}".format(
+"{name}: {short_desc}\n\n{long_desc}".format(
 name=self.args.importer,
 short_desc=short_desc,
 long_desc=long_desc,
 )
 )
 fields_map = dict(self.args.map)
 if fields_map:
 if FIELDS_MAP in options:
 self.parser.error(
 _(
-u"fields_map must be specified either preencoded in --option or using --map, but not both at the same time"
+"fields_map must be specified either preencoded in --option or using --map, but not both at the same time"
 )
 )
 options[FIELDS_MAP] = json.dumps(fields_map)
 def gotId(id_):

Mercurial > libervia-backend

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