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

@ -1,4 +1,4 @@
#!/usr/bin/env python2
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# SAT plugin for Jabber Search (xep-0055)
@ -36,7 +36,7 @@ try:
from twisted.words.protocols.xmlstream import XMPPHandler
except ImportError:
from wokkel.subprotocols import XMPPHandler
from zope.interface import implements
from zope.interface import implementer
NS_SEARCH = "jabber:iq:search"
@ -84,7 +84,7 @@ class XEP_0055(object):
in_sign="ss",
out_sign="s",
method=self._getFieldsUI,
async=True,
async_=True,
)
host.bridge.addMethod(
"searchRequest",
@ -92,7 +92,7 @@ class XEP_0055(object):
in_sign="sa{ss}s",
out_sign="s",
method=self._searchRequest,
async=True,
async_=True,
)
self.__search_menu_id = host.registerCallback(self._getMainUI, with_data=True)
@ -193,7 +193,7 @@ class XEP_0055(object):
main_ui.addDivider("blank") # a blank line again after the button
simple_data = {
key: value for key, value in data.iteritems() if key in (FIELD_SINGLE,)
key: value for key, value in data.items() if key in (FIELD_SINGLE,)
}
if simple_data:
log.debug("Simple search with %s on %s" % (simple_data, service_jid))
@ -234,11 +234,11 @@ class XEP_0055(object):
# get the selected service
service_jid_s = data.get("service_jid_extra", "")
if not service_jid_s:
service_jid_s = data.get("service_jid", unicode(services[0]))
service_jid_s = data.get("service_jid", str(services[0]))
log.debug("Refreshing search fields for %s" % service_jid_s)
else:
service_jid_s = data.get(FIELD_CURRENT_SERVICE, unicode(services[0]))
services_s = [unicode(service) for service in services]
service_jid_s = data.get(FIELD_CURRENT_SERVICE, str(services[0]))
services_s = [str(service) for service in services]
if service_jid_s not in services_s:
services_s.append(service_jid_s)
@ -286,7 +286,7 @@ class XEP_0055(object):
"""
field_list = data_form.Form.fromElement(form_elt).fieldList
adv_fields = [field.var for field in field_list if field.var]
adv_data = {key: value for key, value in data.iteritems() if key in adv_fields}
adv_data = {key: value for key, value in data.items() if key in adv_fields}
xml_tools.dataForm2Widgets(main_ui, data_form.Form.fromElement(form_elt))
@ -332,13 +332,13 @@ class XEP_0055(object):
if "jid" in headers: # use XMLUI JidsListWidget to display the results
values = {}
for i in range(len(xmlui_data)):
header = headers.keys()[i % len(headers)]
header = list(headers.keys())[i % len(headers)]
widget_type, widget_args, widget_kwargs = xmlui_data[i]
value = widget_args[0]
values.setdefault(header, []).append(
jid.JID(value) if header == "jid" else value
)
main_ui.addJidsList(jids=values["jid"], name=D_(u"Search results"))
main_ui.addJidsList(jids=values["jid"], name=D_("Search results"))
# TODO: also display the values other than JID
else:
xml_tools.XMLUIData2AdvancedList(main_ui, headers, xmlui_data)
@ -381,12 +381,12 @@ class XEP_0055(object):
@return: domish.Element
"""
try:
query_elts = answer.elements("jabber:iq:search", "query").next()
query_elts = next(answer.elements("jabber:iq:search", "query"))
except StopIteration:
log.info(_("No query element found"))
raise DataError # FIXME: StanzaError is probably more appropriate, check the RFC
try:
form_elt = query_elts.elements(data_form.NS_X_DATA, "x").next()
form_elt = next(query_elts.elements(data_form.NS_X_DATA, "x"))
except StopIteration:
log.info(_("No data form found"))
raise NotImplementedError(
@ -400,7 +400,7 @@ class XEP_0055(object):
@param failure (defer.failure.Failure): twisted failure
@raise: the unchanged defer.failure.Failure
"""
log.info(_("Fields request failure: %s") % unicode(failure.getErrorMessage()))
log.info(_("Fields request failure: %s") % str(failure.getErrorMessage()))
raise failure
## Do the search ##
@ -488,12 +488,12 @@ class XEP_0055(object):
@return: domish.Element
"""
try:
query_elts = answer.elements("jabber:iq:search", "query").next()
query_elts = next(answer.elements("jabber:iq:search", "query"))
except StopIteration:
log.info(_("No query element found"))
raise DataError # FIXME: StanzaError is probably more appropriate, check the RFC
try:
form_elt = query_elts.elements(data_form.NS_X_DATA, "x").next()
form_elt = next(query_elts.elements(data_form.NS_X_DATA, "x"))
except StopIteration:
log.info(_("No data form found"))
raise NotImplementedError(
@ -507,12 +507,12 @@ class XEP_0055(object):
@param failure (defer.failure.Failure): twisted failure
@raise: the unchanged defer.failure.Failure
"""
log.info(_("Search request failure: %s") % unicode(failure.getErrorMessage()))
log.info(_("Search request failure: %s") % str(failure.getErrorMessage()))
raise failure
@implementer(iwokkel.IDisco)
class XEP_0055_handler(XMPPHandler):
implements(iwokkel.IDisco)
def __init__(self, plugin_parent, profile):
self.plugin_parent = plugin_parent