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 microbloging with roster access
@ -25,7 +25,7 @@ log = getLogger(__name__)
from twisted.internet import defer
from sat.core import exceptions
from wokkel import disco, data_form, iwokkel
from zope.interface import implements
from zope.interface import implementer
try:
from twisted.words.protocols.xmlstream import XMPPHandler
@ -78,12 +78,12 @@ class GroupBlog(object):
client.server_groupblog_available = False
log.warning(
_(
u"Server is not able to manage item-access pubsub, we can't use group blog"
"Server is not able to manage item-access pubsub, we can't use group blog"
)
)
else:
client.server_groupblog_available = True
log.info(_(u"Server can manage group blogs"))
log.info(_("Server can manage group blogs"))
def getFeatures(self, profile):
try:
@ -119,8 +119,8 @@ class GroupBlog(object):
if not groups:
return
if not client.server_groupblog_available:
raise exceptions.CancelError(u"GroupBlog is not available")
log.debug(u"This entry use group blog")
raise exceptions.CancelError("GroupBlog is not available")
log.debug("This entry use group blog")
form = data_form.Form("submit", formNamespace=NS_PUBSUB_ITEM_CONFIG)
access = data_form.Field(
None, self._p.OPT_ACCESS_MODEL, value=self._p.ACCESS_PUBLISHER_ROSTER
@ -139,8 +139,8 @@ class GroupBlog(object):
options[self._p.OPT_ACCESS_MODEL] = self._p.ACCESS_PUBLISHER_ROSTER
options[self._p.OPT_ROSTER_GROUPS_ALLOWED] = mb_data['groups']
@implementer(iwokkel.IDisco)
class GroupBlog_handler(XMPPHandler):
implements(iwokkel.IDisco)
def getDiscoInfo(self, requestor, target, nodeIdentifier=""):
return [disco.DiscoFeature(NS_GROUPBLOG)]