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
This commit is contained in:
Goffi 2019-08-13 19:08:41 +02:00
commit fbfe96c505

View file

@ -18,7 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import base
from . import base
from sat.core.i18n import _
from sat.tools.common.ansi import ANSI as A
from sat_frontends.jp.constants import Const as C
@ -30,7 +30,7 @@ import time
__commands__ = ["Event"]
OUTPUT_OPT_TABLE = u"table"
OUTPUT_OPT_TABLE = "table"
# TODO: move date parsing to base, it may be useful for other commands
@ -45,7 +45,7 @@ class Get(base.CommandBase):
use_pubsub=True,
pubsub_flags={C.SINGLE_ITEM},
use_verbose=True,
help=_(u"get event data"),
help=_("get event data"),
)
self.need_loop = True
@ -67,7 +67,7 @@ class Get(base.CommandBase):
callback=self.eventInviteeGetCb,
errback=partial(
self.errback,
msg=_(u"can't get event data: {}"),
msg=_("can't get event data: {}"),
exit_code=C.EXIT_BRIDGE_ERRBACK,
),
)
@ -78,22 +78,20 @@ class EventBase(object):
self.parser.add_argument(
"-i",
"--id",
type=base.unicode_decoder,
default=u"",
help=_(u"ID of the PubSub Item"),
default="",
help=_("ID of the PubSub Item"),
)
self.parser.add_argument(
"-d", "--date", type=unicode, help=_(u"date of the event")
"-d", "--date", type=str, help=_("date of the event")
)
self.parser.add_argument(
"-f",
"--field",
type=base.unicode_decoder,
action="append",
nargs=2,
dest="fields",
metavar=(u"KEY", u"VALUE"),
help=_(u"configuration field to set"),
metavar=("KEY", "VALUE"),
help=_("configuration field to set"),
)
def parseFields(self):
@ -106,10 +104,10 @@ class EventBase(object):
except ValueError:
try:
date_time = du_parser.parse(
self.args.date, dayfirst=not (u"-" in self.args.date)
self.args.date, dayfirst=not ("-" in self.args.date)
)
except ValueError as e:
self.parser.error(_(u"Can't parse date: {msg}").format(msg=e))
self.parser.error(_("Can't parse date: {msg}").format(msg=e))
if date_time.tzinfo is None:
date = calendar.timegm(date_time.timetuple())
else:
@ -131,7 +129,7 @@ class Create(EventBase, base.CommandBase):
self.need_loop = True
def eventCreateCb(self, node):
self.disp(_(u"Event created successfuly on node {node}").format(node=node))
self.disp(_("Event created successfuly on node {node}").format(node=node))
self.host.quit()
def start(self):
@ -147,7 +145,7 @@ class Create(EventBase, base.CommandBase):
callback=self.eventCreateCb,
errback=partial(
self.errback,
msg=_(u"can't create event: {}"),
msg=_("can't create event: {}"),
exit_code=C.EXIT_BRIDGE_ERRBACK,
),
)
@ -178,7 +176,7 @@ class Modify(EventBase, base.CommandBase):
callback=self.host.quit,
errback=partial(
self.errback,
msg=_(u"can't update event data: {}"),
msg=_("can't update event data: {}"),
exit_code=C.EXIT_BRIDGE_ERRBACK,
),
)
@ -194,7 +192,7 @@ class InviteeGet(base.CommandBase):
use_pubsub=True,
pubsub_flags={C.NODE, C.ITEM, C.SINGLE_ITEM},
use_verbose=True,
help=_(u"get event attendance"),
help=_("get event attendance"),
)
self.need_loop = True
@ -213,7 +211,7 @@ class InviteeGet(base.CommandBase):
callback=self.eventInviteeGetCb,
errback=partial(
self.errback,
msg=_(u"can't get event data: {}"),
msg=_("can't get event data: {}"),
exit_code=C.EXIT_BRIDGE_ERRBACK,
),
)
@ -235,12 +233,11 @@ class InviteeSet(base.CommandBase):
self.parser.add_argument(
"-f",
"--field",
type=base.unicode_decoder,
action="append",
nargs=2,
dest="fields",
metavar=(u"KEY", u"VALUE"),
help=_(u"configuration field to set"),
metavar=("KEY", "VALUE"),
help=_("configuration field to set"),
)
def start(self):
@ -253,7 +250,7 @@ class InviteeSet(base.CommandBase):
callback=self.host.quit,
errback=partial(
self.errback,
msg=_(u"can't set event data: {}"),
msg=_("can't set event data: {}"),
exit_code=C.EXIT_BRIDGE_ERRBACK,
),
)
@ -271,7 +268,7 @@ class InviteesList(base.CommandBase):
use_pubsub=True,
pubsub_flags={C.NODE},
use_verbose=True,
help=_(u"get event attendance"),
help=_("get event attendance"),
)
self.need_loop = True
@ -280,26 +277,26 @@ class InviteesList(base.CommandBase):
"-m",
"--missing",
action="store_true",
help=_(u"show missing people (invited but no R.S.V.P. so far)"),
help=_("show missing people (invited but no R.S.V.P. so far)"),
)
self.parser.add_argument(
"-R",
"--no-rsvp",
action="store_true",
help=_(u"don't show people which gave R.S.V.P."),
help=_("don't show people which gave R.S.V.P."),
)
def _attend_filter(self, attend, row):
if attend == u"yes":
if attend == "yes":
attend_color = C.A_SUCCESS
elif attend == u"no":
elif attend == "no":
attend_color = C.A_FAILURE
else:
attend_color = A.FG_WHITE
return A.color(attend_color, attend)
def _guests_filter(self, guests):
return u"(" + unicode(guests) + ")" if guests else u""
return "(" + str(guests) + ")" if guests else ""
def default_output(self, event_data):
data = []
@ -309,13 +306,13 @@ class InviteesList(base.CommandBase):
attendees_missing = 0
guests = 0
guests_maybe = 0
for jid_, jid_data in event_data.iteritems():
jid_data[u"jid"] = jid_
for jid_, jid_data in event_data.items():
jid_data["jid"] = jid_
try:
guests_int = int(jid_data["guests"])
except (ValueError, KeyError):
pass
attend = jid_data.get(u"attend", u"")
attend = jid_data.get("attend", "")
if attend == "yes":
attendees_yes += 1
guests += guests_int
@ -324,10 +321,10 @@ class InviteesList(base.CommandBase):
guests_maybe += guests_int
elif attend == "no":
attendees_no += 1
jid_data[u"guests"] = ""
jid_data["guests"] = ""
else:
attendees_missing += 1
jid_data[u"guests"] = ""
jid_data["guests"] = ""
data.append(jid_data)
show_table = OUTPUT_OPT_TABLE in self.args.output_opts
@ -335,60 +332,60 @@ class InviteesList(base.CommandBase):
table = common.Table.fromDict(
self.host,
data,
(u"nick",)
+ ((u"jid",) if self.host.verbosity else ())
+ (u"attend", "guests"),
("nick",)
+ (("jid",) if self.host.verbosity else ())
+ ("attend", "guests"),
headers=None,
filters={
u"nick": A.color(C.A_HEADER, u"{}" if show_table else u"{} "),
u"jid": u"{}" if show_table else u"{} ",
u"attend": self._attend_filter,
u"guests": u"{}" if show_table else self._guests_filter,
"nick": A.color(C.A_HEADER, "{}" if show_table else "{} "),
"jid": "{}" if show_table else "{} ",
"attend": self._attend_filter,
"guests": "{}" if show_table else self._guests_filter,
},
defaults={u"nick": u"", u"attend": u"", u"guests": 1},
defaults={"nick": "", "attend": "", "guests": 1},
)
if show_table:
table.display()
else:
table.display_blank(show_header=False, col_sep=u"")
table.display_blank(show_header=False, col_sep="")
if not self.args.no_rsvp:
self.disp(u"")
self.disp("")
self.disp(
A.color(
C.A_SUBHEADER,
_(u"Attendees: "),
_("Attendees: "),
A.RESET,
unicode(len(data)),
_(u" ("),
str(len(data)),
_(" ("),
C.A_SUCCESS,
_(u"yes: "),
unicode(attendees_yes),
_("yes: "),
str(attendees_yes),
A.FG_WHITE,
_(u", maybe: "),
unicode(attendees_maybe),
u", ",
_(", maybe: "),
str(attendees_maybe),
", ",
C.A_FAILURE,
_(u"no: "),
unicode(attendees_no),
_("no: "),
str(attendees_no),
A.RESET,
u")",
")",
)
)
self.disp(
A.color(C.A_SUBHEADER, _(u"confirmed guests: "), A.RESET, unicode(guests))
A.color(C.A_SUBHEADER, _("confirmed guests: "), A.RESET, str(guests))
)
self.disp(
A.color(
C.A_SUBHEADER,
_(u"unconfirmed guests: "),
_("unconfirmed guests: "),
A.RESET,
unicode(guests_maybe),
str(guests_maybe),
)
)
self.disp(
A.color(
C.A_SUBHEADER, _(u"total: "), A.RESET, unicode(guests + guests_maybe)
C.A_SUBHEADER, _("total: "), A.RESET, str(guests + guests_maybe)
)
)
if attendees_missing:
@ -396,9 +393,9 @@ class InviteesList(base.CommandBase):
self.disp(
A.color(
C.A_SUBHEADER,
_(u"missing people (no reply): "),
_("missing people (no reply): "),
A.RESET,
unicode(attendees_missing),
str(attendees_missing),
)
)
@ -420,9 +417,9 @@ class InviteesList(base.CommandBase):
prefilled_data.update(event_data)
# we get nicknames for everybody, make it easier for organisers
for jid_, data in prefilled_data.iteritems():
for jid_, data in prefilled_data.items():
id_data = self.host.bridge.identityGet(jid_, self.profile)
data[u"nick"] = id_data.get(u"nick", u"")
data["nick"] = id_data.get("nick", "")
self.output(prefilled_data)
self.host.quit()
@ -435,7 +432,7 @@ class InviteesList(base.CommandBase):
callback=partial(self.eventInviteesListCb, prefilled_data=prefilled_data),
errback=partial(
self.errback,
msg=_(u"can't get event data: {}"),
msg=_("can't get event data: {}"),
exit_code=C.EXIT_BRIDGE_ERRBACK,
),
)
@ -446,14 +443,14 @@ class InviteesList(base.CommandBase):
# we only consider people with "publisher" affiliation as invited, creators are not, and members can just observe
prefilled = {
jid_: {}
for jid_, affiliation in affiliations.iteritems()
if affiliation in (u"publisher",)
for jid_, affiliation in affiliations.items()
if affiliation in ("publisher",)
}
self.getList(prefilled)
def start(self):
if self.args.no_rsvp and not self.args.missing:
self.parser.error(_(u"you need to use --missing if you use --no-rsvp"))
self.parser.error(_("you need to use --missing if you use --no-rsvp"))
if self.args.missing:
self.host.bridge.psNodeAffiliationsGet(
self.args.service,
@ -462,7 +459,7 @@ class InviteesList(base.CommandBase):
callback=self.psNodeAffiliationsGetCb,
errback=partial(
self.errback,
msg=_(u"can't get event data: {}"),
msg=_("can't get event data: {}"),
exit_code=C.EXIT_BRIDGE_ERRBACK,
),
)
@ -478,7 +475,7 @@ class InviteeInvite(base.CommandBase):
"invite",
use_pubsub=True,
pubsub_flags={C.NODE, C.SINGLE_ITEM},
help=_(u"invite someone to the event through email"),
help=_("invite someone to the event through email"),
)
self.need_loop = True
@ -487,49 +484,42 @@ class InviteeInvite(base.CommandBase):
"-e",
"--email",
action="append",
type=base.unicode_decoder,
default=[],
help="email(s) to send the invitation to",
)
self.parser.add_argument(
"-N",
"--name",
type=base.unicode_decoder,
default="",
help="name of the invitee",
)
self.parser.add_argument(
"-H",
"--host-name",
type=base.unicode_decoder,
default="",
help="name of the host",
)
self.parser.add_argument(
"-l",
"--lang",
type=base.unicode_decoder,
default="",
help="main language spoken by the invitee",
)
self.parser.add_argument(
"-U",
"--url-template",
type=base.unicode_decoder,
default="",
help="template to construct the URL",
)
self.parser.add_argument(
"-S",
"--subject",
type=base.unicode_decoder,
default="",
help="subject of the invitation email (default: generic subject)",
)
self.parser.add_argument(
"-b",
"--body",
type=base.unicode_decoder,
default="",
help="body of the invitation email (default: generic body)",
)
@ -554,7 +544,7 @@ class InviteeInvite(base.CommandBase):
callback=self.host.quit,
errback=partial(
self.errback,
msg=_(u"can't create invitation: {}"),
msg=_("can't create invitation: {}"),
exit_code=C.EXIT_BRIDGE_ERRBACK,
),
)
@ -565,7 +555,7 @@ class Invitee(base.CommandBase):
def __init__(self, host):
super(Invitee, self).__init__(
host, "invitee", use_profile=False, help=_(u"manage invities")
host, "invitee", use_profile=False, help=_("manage invities")
)