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 managing xep-0095
@ -25,7 +25,7 @@ log = getLogger(__name__)
from sat.core import exceptions
from twisted.words.protocols.jabber import xmlstream
from twisted.words.protocols.jabber import error
from zope.interface import implements
from zope.interface import implementer
from wokkel import disco
from wokkel import iwokkel
import uuid
@ -71,7 +71,7 @@ class XEP_0095(object):
del self.si_profiles[si_profile]
except KeyError:
log.error(
u"Trying to unregister SI profile [{}] which was not registered".format(
"Trying to unregister SI profile [{}] which was not registered".format(
si_profile
)
)
@ -83,7 +83,7 @@ class XEP_0095(object):
"""
log.info(_("XEP-0095 Stream initiation"))
iq_elt.handled = True
si_elt = iq_elt.elements(NS_SI, "si").next()
si_elt = next(iq_elt.elements(NS_SI, "si"))
si_id = si_elt["id"]
si_mime_type = iq_elt.getAttribute("mime-type", "application/octet-stream")
si_profile = si_elt["profile"]
@ -136,9 +136,9 @@ class XEP_0095(object):
def _parseOfferResult(self, iq_elt):
try:
si_elt = iq_elt.elements(NS_SI, "si").next()
si_elt = next(iq_elt.elements(NS_SI, "si"))
except StopIteration:
log.warning(u"No <si/> element found in result while expected")
log.warning("No <si/> element found in result while expected")
raise exceptions.DataError
return (iq_elt, si_elt)
@ -165,7 +165,7 @@ class XEP_0095(object):
"""
offer = client.IQ()
sid = str(uuid.uuid4())
log.debug(_(u"Stream Session ID: %s") % offer["id"])
log.debug(_("Stream Session ID: %s") % offer["id"])
offer["from"] = client.jid.full()
offer["to"] = to_jid.full()
@ -182,8 +182,8 @@ class XEP_0095(object):
return sid, offer_d
@implementer(iwokkel.IDisco)
class XEP_0095_handler(xmlstream.XMPPHandler):
implements(iwokkel.IDisco)
def __init__(self, plugin_parent):
self.plugin_parent = plugin_parent
@ -197,7 +197,7 @@ class XEP_0095_handler(xmlstream.XMPPHandler):
def getDiscoInfo(self, requestor, target, nodeIdentifier=""):
return [disco.DiscoFeature(NS_SI)] + [
disco.DiscoFeature(
u"http://jabber.org/protocol/si/profile/{}".format(profile_name)
"http://jabber.org/protocol/si/profile/{}".format(profile_name)
)
for profile_name in self.plugin_parent.si_profiles
]