Mercurial > libervia-backend
diff sat/plugins/plugin_xep_0059.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 | 9d0df638c8b4 |
line wrap: on
line diff
--- a/sat/plugins/plugin_xep_0059.py Wed Jul 31 11:31:22 2019 +0200 +++ b/sat/plugins/plugin_xep_0059.py Tue Aug 13 19:08:41 2019 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # SAT plugin for Result Set Management (XEP-0059) @@ -29,27 +29,27 @@ from wokkel import rsm from twisted.words.protocols.jabber import xmlstream -from zope.interface import implements +from zope.interface import implementer PLUGIN_INFO = { - C.PI_NAME: u"Result Set Management", - C.PI_IMPORT_NAME: u"XEP-0059", - C.PI_TYPE: u"XEP", - C.PI_PROTOCOLS: [u"XEP-0059"], - C.PI_MAIN: u"XEP_0059", - C.PI_HANDLER: u"yes", - C.PI_DESCRIPTION: _(u"""Implementation of Result Set Management"""), + C.PI_NAME: "Result Set Management", + C.PI_IMPORT_NAME: "XEP-0059", + C.PI_TYPE: "XEP", + C.PI_PROTOCOLS: ["XEP-0059"], + C.PI_MAIN: "XEP_0059", + C.PI_HANDLER: "yes", + C.PI_DESCRIPTION: _("""Implementation of Result Set Management"""), } -RSM_PREFIX = u"rsm_" +RSM_PREFIX = "rsm_" class XEP_0059(object): # XXX: RSM management is done directly in Wokkel. def __init__(self, host): - log.info(_(u"Result Set Management plugin initialization")) + log.info(_("Result Set Management plugin initialization")) def getHandler(self, client): return XEP_0059_handler() @@ -61,13 +61,13 @@ @return (rsm.RSMRequest, None): request with parsed arguments or None if no RSM arguments have been found """ - if int(extra.get(RSM_PREFIX + u'max', 0)) < 0: - raise ValueError(_(u"rsm_max can't be negative")) + if int(extra.get(RSM_PREFIX + 'max', 0)) < 0: + raise ValueError(_("rsm_max can't be negative")) rsm_args = {} - for arg in (u"max", u"after", u"before", u"index"): + for arg in ("max", "after", "before", "index"): try: - argname = "max_" if arg == u"max" else arg + argname = "max_" if arg == "max" else arg rsm_args[argname] = extra.pop(RSM_PREFIX + arg) except KeyError: continue @@ -95,18 +95,18 @@ if data is None: data = {} if rsm_response.first is not None: - data[u"rsm_first"] = rsm_response.first + data["rsm_first"] = rsm_response.first if rsm_response.last is not None: - data[u"rsm_last"] = rsm_response.last + data["rsm_last"] = rsm_response.last if rsm_response.index is not None: - data[u"rsm_index"] = unicode(rsm_response.index) + data["rsm_index"] = str(rsm_response.index) if rsm_response.index is not None: - data[u"rsm_index"] = unicode(rsm_response.index) + data["rsm_index"] = str(rsm_response.index) return data +@implementer(iwokkel.IDisco) class XEP_0059_handler(xmlstream.XMPPHandler): - implements(iwokkel.IDisco) def getDiscoInfo(self, requestor, target, nodeIdentifier=""): return [disco.DiscoFeature(rsm.NS_RSM)]