Mercurial > libervia-backend
diff sat/plugins/plugin_xep_0100.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_0100.py Wed Jul 31 11:31:22 2019 +0200 +++ b/sat/plugins/plugin_xep_0100.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 managing gateways (xep-0100) @@ -38,7 +38,7 @@ } WARNING_MSG = D_( - u"""Be careful ! Gateways allow you to use an external IM (legacy IM), so you can see your contact as XMPP contacts. + """Be careful ! Gateways allow you to use an external IM (legacy IM), so you can see your contact as XMPP contacts. But when you do this, all your messages go throught the external legacy IM server, it is a huge privacy issue (i.e.: all your messages throught the gateway can be monitored, recorded, analysed by the external server, most of time a private company).""" ) @@ -133,7 +133,7 @@ xmlui.changeContainer("advanced_list", columns=3) xmlui.addLabel(_("Use external XMPP server")) xmlui.addString("external_jid") - xmlui.addButton(self.__menu_id, _(u"Go !"), fields_back=("external_jid",)) + xmlui.addButton(self.__menu_id, _("Go !"), fields_back=("external_jid",)) return xmlui def _gatewaySelectedCb(self, data, profile): @@ -156,7 +156,7 @@ if category != "gateway": log.error( _( - u'INTERNAL ERROR: identity category should always be "gateway" in _getTypeString, got "%s"' + 'INTERNAL ERROR: identity category should always be "gateway" in _getTypeString, got "%s"' ) % category ) @@ -208,7 +208,7 @@ ] if gateways: log.info( - _(u"Found gateway [%(jid)s]: %(identity_name)s") + _("Found gateway [%(jid)s]: %(identity_name)s") % { "jid": entity.full(), "identity_name": " - ".join( @@ -219,7 +219,7 @@ ret.append((success, (entity, gateways))) else: log.info( - _(u"Skipping [%(jid)s] which is not a gateway") + _("Skipping [%(jid)s] which is not a gateway") % {"jid": entity.full()} ) return ret @@ -233,7 +233,7 @@ _defers = [] for item in disco._items: - log.debug(_(u"item found: %s") % item.entity) + log.debug(_("item found: %s") % item.entity) _defers.append(client.disco.requestInfo(item.entity)) dl = defer.DeferredList(_defers) dl.addCallback( @@ -257,7 +257,7 @@ """ client = self.host.getClient(profile) log.debug( - _(u"find gateways (target = %(target)s, profile = %(profile)s)") + _("find gateways (target = %(target)s, profile = %(profile)s)") % {"target": target.full(), "profile": profile} ) d = client.disco.requestItems(target)