From 51776603e09c77e914d2f8ad591fc5fb54f09c11 Mon Sep 17 00:00:00 2001 From: Goffi Date: Tue, 24 Mar 2026 16:30:03 +0100 Subject: [PATCH] depdencies, core: update Tx-XMPP to be version >= 10.0: This version changes the package name, so all `wokkel` imports habe been replaced by `tx_xmpp` --- libervia/backend/core/core_types.py | 2 +- libervia/backend/core/main.py | 2 +- libervia/backend/core/patches.py | 2 +- libervia/backend/core/xmpp.py | 26 +++++------ libervia/backend/memory/disco.py | 6 +-- libervia/backend/memory/sqla_mapping.py | 2 +- libervia/backend/plugins/plugin_adhoc_dbus.py | 2 +- .../plugin_comp_ap_gateway/__init__.py | 2 +- .../plugins/plugin_comp_ap_gateway/ad_hoc.py | 2 +- .../plugin_comp_ap_gateway/http_server.py | 2 +- .../plugin_comp_ap_gateway/pubsub_service.py | 2 +- .../plugin_comp_conferences/__init__.py | 4 +- .../plugin_comp_email_gateway/__init__.py | 4 +- .../pubsub_service.py | 2 +- .../plugins/plugin_comp_file_sharing.py | 4 +- .../backend/plugins/plugin_exp_data_policy.py | 2 +- libervia/backend/plugins/plugin_exp_gre.py | 4 +- .../backend/plugins/plugin_exp_invitation.py | 4 +- .../plugins/plugin_exp_list_of_interest.py | 4 +- .../plugins/plugin_exp_pubsub_admin.py | 4 +- .../backend/plugins/plugin_misc_groupblog.py | 6 +-- libervia/backend/plugins/plugin_misc_ip.py | 4 +- .../plugins/plugin_misc_pubsub_contacts.py | 6 +-- .../plugins/plugin_misc_remote_control.py | 4 +- .../backend/plugins/plugin_misc_room_game.py | 20 ++++----- libervia/backend/plugins/plugin_misc_tarot.py | 2 +- .../backend/plugins/plugin_pubsub_cache.py | 2 +- .../plugin_sec_gre_encrypter_openpgp.py | 4 +- .../plugins/plugin_sec_gre_formatter_mime.py | 4 +- libervia/backend/plugins/plugin_xep_0004.py | 12 ++--- libervia/backend/plugins/plugin_xep_0020.py | 6 +-- libervia/backend/plugins/plugin_xep_0033.py | 4 +- libervia/backend/plugins/plugin_xep_0045.py | 8 ++-- libervia/backend/plugins/plugin_xep_0047.py | 6 +-- libervia/backend/plugins/plugin_xep_0049.py | 2 +- libervia/backend/plugins/plugin_xep_0050.py | 6 +-- libervia/backend/plugins/plugin_xep_0054.py | 4 +- libervia/backend/plugins/plugin_xep_0055.py | 8 ++-- libervia/backend/plugins/plugin_xep_0059.py | 44 +++++++++---------- libervia/backend/plugins/plugin_xep_0060.py | 16 +++---- libervia/backend/plugins/plugin_xep_0065.py | 4 +- libervia/backend/plugins/plugin_xep_0070.py | 6 +-- libervia/backend/plugins/plugin_xep_0071.py | 6 +-- libervia/backend/plugins/plugin_xep_0077.py | 4 +- libervia/backend/plugins/plugin_xep_0084.py | 4 +- libervia/backend/plugins/plugin_xep_0085.py | 4 +- libervia/backend/plugins/plugin_xep_0092.py | 2 +- libervia/backend/plugins/plugin_xep_0095.py | 6 +-- libervia/backend/plugins/plugin_xep_0100.py | 2 +- libervia/backend/plugins/plugin_xep_0106.py | 2 +- libervia/backend/plugins/plugin_xep_0115.py | 6 +-- libervia/backend/plugins/plugin_xep_0131.py | 2 +- libervia/backend/plugins/plugin_xep_0163.py | 6 +-- .../plugins/plugin_xep_0166/__init__.py | 4 +- .../plugins/plugin_xep_0167/__init__.py | 4 +- libervia/backend/plugins/plugin_xep_0176.py | 4 +- libervia/backend/plugins/plugin_xep_0184.py | 6 +-- libervia/backend/plugins/plugin_xep_0191.py | 4 +- libervia/backend/plugins/plugin_xep_0198.py | 4 +- libervia/backend/plugins/plugin_xep_0199.py | 4 +- libervia/backend/plugins/plugin_xep_0203.py | 6 +-- libervia/backend/plugins/plugin_xep_0215.py | 4 +- libervia/backend/plugins/plugin_xep_0231.py | 4 +- libervia/backend/plugins/plugin_xep_0234.py | 4 +- libervia/backend/plugins/plugin_xep_0249.py | 6 +-- libervia/backend/plugins/plugin_xep_0260.py | 6 +-- libervia/backend/plugins/plugin_xep_0261.py | 6 +-- libervia/backend/plugins/plugin_xep_0264.py | 4 +- libervia/backend/plugins/plugin_xep_0272.py | 6 +-- libervia/backend/plugins/plugin_xep_0277.py | 6 +-- libervia/backend/plugins/plugin_xep_0280.py | 6 +-- libervia/backend/plugins/plugin_xep_0292.py | 4 +- libervia/backend/plugins/plugin_xep_0293.py | 4 +- libervia/backend/plugins/plugin_xep_0294.py | 4 +- libervia/backend/plugins/plugin_xep_0297.py | 4 +- libervia/backend/plugins/plugin_xep_0298.py | 4 +- libervia/backend/plugins/plugin_xep_0300.py | 4 +- libervia/backend/plugins/plugin_xep_0308.py | 2 +- libervia/backend/plugins/plugin_xep_0313.py | 8 ++-- libervia/backend/plugins/plugin_xep_0320.py | 4 +- libervia/backend/plugins/plugin_xep_0329.py | 4 +- libervia/backend/plugins/plugin_xep_0334.py | 4 +- libervia/backend/plugins/plugin_xep_0338.py | 4 +- libervia/backend/plugins/plugin_xep_0339.py | 4 +- libervia/backend/plugins/plugin_xep_0343.py | 4 +- libervia/backend/plugins/plugin_xep_0346.py | 8 ++-- libervia/backend/plugins/plugin_xep_0353.py | 4 +- libervia/backend/plugins/plugin_xep_0358.py | 4 +- libervia/backend/plugins/plugin_xep_0359.py | 2 +- libervia/backend/plugins/plugin_xep_0363.py | 4 +- libervia/backend/plugins/plugin_xep_0372.py | 4 +- .../plugins/plugin_xep_0373/__init__.py | 4 +- libervia/backend/plugins/plugin_xep_0374.py | 2 +- libervia/backend/plugins/plugin_xep_0376.py | 4 +- libervia/backend/plugins/plugin_xep_0384.py | 2 +- libervia/backend/plugins/plugin_xep_0391.py | 4 +- libervia/backend/plugins/plugin_xep_0402.py | 2 +- libervia/backend/plugins/plugin_xep_0422.py | 2 +- libervia/backend/plugins/plugin_xep_0424.py | 2 +- libervia/backend/plugins/plugin_xep_0428.py | 2 +- libervia/backend/plugins/plugin_xep_0433.py | 2 +- libervia/backend/plugins/plugin_xep_0444.py | 4 +- libervia/backend/plugins/plugin_xep_0448.py | 4 +- libervia/backend/plugins/plugin_xep_0461.py | 4 +- libervia/backend/plugins/plugin_xep_0465.py | 4 +- libervia/backend/plugins/plugin_xep_0470.py | 4 +- libervia/backend/plugins/plugin_xep_0471.py | 6 +-- libervia/backend/plugins/plugin_xep_0473.py | 6 +-- libervia/backend/plugins/plugin_xep_0475.py | 6 +-- libervia/backend/plugins/plugin_xep_0477.py | 6 +-- libervia/backend/plugins/plugin_xep_0498.py | 4 +- libervia/backend/plugins/plugin_xep_0499.py | 2 +- libervia/backend/test/helpers.py | 4 +- libervia/backend/test/helpers_plugins.py | 14 +++--- libervia/backend/test/test_core_xmpp.py | 4 +- .../backend/test/test_plugin_misc_radiocol.py | 4 +- .../test/test_plugin_misc_room_game.py | 2 +- libervia/backend/test/test_plugin_xep_0085.py | 2 +- libervia/backend/test/test_plugin_xep_0277.py | 2 +- libervia/backend/test/test_plugin_xep_0297.py | 2 +- libervia/backend/test/test_plugin_xep_0313.py | 6 +-- libervia/backend/test/test_plugin_xep_0334.py | 2 +- libervia/backend/tools/utils.py | 2 +- libervia/backend/tools/xml_tools.py | 4 +- pyproject.toml | 2 +- tests/unit/conftest.py | 2 +- tests/unit/test_ap-gateway.py | 2 +- tests/unit/test_email_gateway.py | 2 +- .../unit/test_plugin_misc_pubsub_contacts.py | 2 +- uv.lock | 8 ++-- 130 files changed, 309 insertions(+), 309 deletions(-) diff --git a/libervia/backend/core/core_types.py b/libervia/backend/core/core_types.py index 2e4b5816..3b0c12ce 100644 --- a/libervia/backend/core/core_types.py +++ b/libervia/backend/core/core_types.py @@ -27,7 +27,7 @@ from typing_extensions import TypedDict from twisted.words.protocols.jabber import jid as t_jid from twisted.words.protocols.jabber import xmlstream from twisted.words.xish import domish -from wokkel import disco +from tx_xmpp import disco from libervia.backend.core import exceptions from libervia.backend.models.core import MessageData diff --git a/libervia/backend/core/main.py b/libervia/backend/core/main.py index 901ea2de..5e6b6487 100644 --- a/libervia/backend/core/main.py +++ b/libervia/backend/core/main.py @@ -40,7 +40,7 @@ from twisted.application import app, service from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.internet import reactor -from wokkel.xmppim import RosterItem +from tx_xmpp.xmppim import RosterItem from libervia.backend import G from libervia.backend.core import xmpp from libervia.backend.core import exceptions diff --git a/libervia/backend/core/patches.py b/libervia/backend/core/patches.py index db8494a8..8e8948b9 100644 --- a/libervia/backend/core/patches.py +++ b/libervia/backend/core/patches.py @@ -12,7 +12,7 @@ from twisted.words.protocols.jabber import ( sasl_mechanisms, xmlstream, ) -from wokkel import client +from tx_xmpp import client from zope.interface import implementer from libervia.backend.core.constants import Const as C diff --git a/libervia/backend/core/xmpp.py b/libervia/backend/core/xmpp.py index bce0bb71..fd43d877 100644 --- a/libervia/backend/core/xmpp.py +++ b/libervia/backend/core/xmpp.py @@ -41,9 +41,9 @@ from twisted.words.protocols.jabber import error from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import client as wokkel_client, disco, generic, iwokkel, xmppim -from wokkel import component -from wokkel import delay +from tx_xmpp import client as tx_xmpp_client, disco, generic, itx_xmpp, xmppim +from tx_xmpp import component +from tx_xmpp import delay from zope.interface import implementer from libervia.backend import G @@ -1026,8 +1026,8 @@ class SatXMPPEntity(core_types.SatXMPPEntity): ExtraDict = dict # TODO -@implementer(iwokkel.IDisco) -class SatXMPPClient(SatXMPPEntity, core_types.SatXMPPClient, wokkel_client.XMPPClient): +@implementer(itx_xmpp.IDisco) +class SatXMPPClient(SatXMPPEntity, core_types.SatXMPPClient, tx_xmpp_client.XMPPClient): trigger_suffix = "" is_component = False @@ -1088,7 +1088,7 @@ class SatXMPPClient(SatXMPPEntity, core_types.SatXMPPClient, wokkel_client.XMPPC tls_required = False configurationForTLS = ssl.CertificateOptions(trustRoot=None) - wokkel_client.XMPPClient.__init__( + tx_xmpp_client.XMPPClient.__init__( self, user_jid, password, @@ -1196,7 +1196,7 @@ class SatXMPPClient(SatXMPPEntity, core_types.SatXMPPClient, wokkel_client.XMPPC d.addCallback(lambda __: super(SatXMPPClient, self)._finish_connection(__)) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class SatXMPPComponent(SatXMPPEntity, core_types.SatXMPPComponent, component.Component): """XMPP component @@ -1437,7 +1437,7 @@ class SatMessageProtocol(xmppim.MessageProtocol): return MessageData() if message_elt.uri == None: - # xmlns may be None when wokkel element parsing strip out root namespace + # xmlns may be None when tx_xmpp element parsing strip out root namespace self.normalize_ns(message_elt, None) elif message_elt.uri != C.NS_CLIENT: log.error( @@ -2097,8 +2097,8 @@ class SatPresenceProtocol(xmppim.PresenceClientProtocol): if statuses is None: statuses = {} - # default for us is None for wokkel - # so we must temporarily switch to wokkel's convention... + # default for us is None for tx_xmpp + # so we must temporarily switch to tx_xmpp's convention... if C.PRESENCE_STATUSES_DEFAULT in statuses: statuses[None] = statuses.pop(C.PRESENCE_STATUSES_DEFAULT) @@ -2165,7 +2165,7 @@ class SatPresenceProtocol(xmppim.PresenceClientProtocol): self.host.bridge.subscribe("unsubscribe", entity.userhost(), self.parent.profile) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class SatDiscoProtocol(disco.DiscoClientProtocol): def __init__(self, host): @@ -2195,7 +2195,7 @@ class SatFallbackHandler(generic.FallbackHandler): class SatVersionHandler(generic.VersionHandler): def getDiscoInfo(self, requestor, target, node): - # XXX: We need to work around wokkel's behaviour (namespace not added if there + # XXX: We need to work around tx_xmpp's behaviour (namespace not added if there # is a node) as it cause issues with XEP-0115 & PEP (XEP-0163): there is a # node when server ask for disco info, and not when we generate the key, so # the hash is used with different disco features, and when the server (seen @@ -2204,7 +2204,7 @@ class SatVersionHandler(generic.VersionHandler): return generic.VersionHandler.getDiscoInfo(self, requestor, target, None) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class SatIdentityHandler(XMPPHandler): """Manage disco Identity of SàT.""" diff --git a/libervia/backend/memory/disco.py b/libervia/backend/memory/disco.py index 8c06f9ae..1b6c5d09 100755 --- a/libervia/backend/memory/disco.py +++ b/libervia/backend/memory/disco.py @@ -33,7 +33,7 @@ from twisted.python import failure from libervia.backend.core.constants import Const as C from libervia.backend.tools import xml_tools from libervia.backend.memory import persistent -from wokkel import disco +from tx_xmpp import disco from base64 import b64encode from hashlib import sha1 @@ -93,7 +93,7 @@ class HashManager(object): element = xml_tools.ElementParser()(xml) disco_info = disco.DiscoInfo.fromElement(element) for ext_form in disco_info.extensions.values(): - # wokkel doesn't call typeCheck on reception, so we do it here + # tx_xmpp doesn't call typeCheck on reception, so we do it here ext_form.typeCheck() if not disco_info.features and not disco_info.identities: log.warning( @@ -231,7 +231,7 @@ class Discovery(object): def infos_cb(disco_infos): cap_hash = self.generate_hash(disco_infos) for ext_form in disco_infos.extensions.values(): - # wokkel doesn't call typeCheck on reception, so we do it here + # tx_xmpp doesn't call typeCheck on reception, so we do it here # to avoid ending up with incorrect types. We have to do it after # the hash has been generated (str value is needed to compute the # hash) diff --git a/libervia/backend/memory/sqla_mapping.py b/libervia/backend/memory/sqla_mapping.py index 8e9ab9ed..f653ac89 100644 --- a/libervia/backend/memory/sqla_mapping.py +++ b/libervia/backend/memory/sqla_mapping.py @@ -44,7 +44,7 @@ from sqlalchemy.sql import false from sqlalchemy.sql.functions import now from sqlalchemy.types import TypeDecorator from twisted.words.protocols.jabber import jid -from wokkel import generic +from tx_xmpp import generic from libervia.backend.core.constants import Const as C diff --git a/libervia/backend/plugins/plugin_adhoc_dbus.py b/libervia/backend/plugins/plugin_adhoc_dbus.py index c22de126..d130ed26 100644 --- a/libervia/backend/plugins/plugin_adhoc_dbus.py +++ b/libervia/backend/plugins/plugin_adhoc_dbus.py @@ -26,7 +26,7 @@ import uuid from twisted.internet import defer from twisted.internet import reactor from twisted.words.protocols.jabber import jid -from wokkel import data_form +from tx_xmpp import data_form from libervia.backend.core.constants import Const as C from libervia.backend.core.core_types import SatXMPPEntity diff --git a/libervia/backend/plugins/plugin_comp_ap_gateway/__init__.py b/libervia/backend/plugins/plugin_comp_ap_gateway/__init__.py index c22fcbd2..dad6cd46 100644 --- a/libervia/backend/plugins/plugin_comp_ap_gateway/__init__.py +++ b/libervia/backend/plugins/plugin_comp_ap_gateway/__init__.py @@ -51,7 +51,7 @@ from twisted.internet import defer, reactor, threads from twisted.web import http from twisted.words.protocols.jabber import error, jid from twisted.words.xish import domish -from wokkel import pubsub, rsm +from tx_xmpp import pubsub, rsm from libervia.backend import G from libervia.backend.core import exceptions diff --git a/libervia/backend/plugins/plugin_comp_ap_gateway/ad_hoc.py b/libervia/backend/plugins/plugin_comp_ap_gateway/ad_hoc.py index 50f21fa0..389154d6 100644 --- a/libervia/backend/plugins/plugin_comp_ap_gateway/ad_hoc.py +++ b/libervia/backend/plugins/plugin_comp_ap_gateway/ad_hoc.py @@ -18,7 +18,7 @@ from typing import cast from twisted.words.protocols.jabber import jid -from wokkel import data_form +from tx_xmpp import data_form from libervia.backend.core.constants import Const as C from libervia.backend.core.core_types import SatXMPPEntity diff --git a/libervia/backend/plugins/plugin_comp_ap_gateway/http_server.py b/libervia/backend/plugins/plugin_comp_ap_gateway/http_server.py index f5cf158e..d67d615e 100644 --- a/libervia/backend/plugins/plugin_comp_ap_gateway/http_server.py +++ b/libervia/backend/plugins/plugin_comp_ap_gateway/http_server.py @@ -30,7 +30,7 @@ from twisted.web import http, resource as web_resource, server from twisted.web import static from twisted.web import util as web_util from twisted.words.protocols.jabber import error, jid -from wokkel import pubsub, rsm +from tx_xmpp import pubsub, rsm from libervia.backend.core import exceptions from libervia.backend.core.constants import Const as C diff --git a/libervia/backend/plugins/plugin_comp_ap_gateway/pubsub_service.py b/libervia/backend/plugins/plugin_comp_ap_gateway/pubsub_service.py index d3d49490..5b2e96fa 100644 --- a/libervia/backend/plugins/plugin_comp_ap_gateway/pubsub_service.py +++ b/libervia/backend/plugins/plugin_comp_ap_gateway/pubsub_service.py @@ -25,7 +25,7 @@ import tempfile from twisted.internet import defer, threads from twisted.words.protocols.jabber import jid, error from twisted.words.xish import domish -from wokkel import rsm, pubsub +from tx_xmpp import rsm, pubsub from libervia.backend.core.i18n import _ from libervia.backend.core import exceptions diff --git a/libervia/backend/plugins/plugin_comp_conferences/__init__.py b/libervia/backend/plugins/plugin_comp_conferences/__init__.py index 80d1348d..1062d0f4 100644 --- a/libervia/backend/plugins/plugin_comp_conferences/__init__.py +++ b/libervia/backend/plugins/plugin_comp_conferences/__init__.py @@ -35,7 +35,7 @@ from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.error import StanzaError from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend import G @@ -571,7 +571,7 @@ class ConferencesComponent: log.error(f"Can't run Galene process: {failure_.value}") -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class ConferencesHandler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_comp_email_gateway/__init__.py b/libervia/backend/plugins/plugin_comp_email_gateway/__init__.py index 6869c17b..3896ee4d 100644 --- a/libervia/backend/plugins/plugin_comp_email_gateway/__init__.py +++ b/libervia/backend/plugins/plugin_comp_email_gateway/__init__.py @@ -41,7 +41,7 @@ from twisted.words.protocols.jabber import error as jabber_error from twisted.words.protocols.jabber.error import StanzaError from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import data_form, disco, iwokkel +from tx_xmpp import data_form, disco, itx_xmpp from zope.interface import implementer from libervia.backend import G @@ -1491,7 +1491,7 @@ class EmailGatewayComponent(GetDataHandler): form.addField(data_form.Field(var="sender_id", value=credentials.user_email)) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class EmailGatewayHandler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_comp_email_gateway/pubsub_service.py b/libervia/backend/plugins/plugin_comp_email_gateway/pubsub_service.py index 3a008996..1ac8a765 100644 --- a/libervia/backend/plugins/plugin_comp_email_gateway/pubsub_service.py +++ b/libervia/backend/plugins/plugin_comp_email_gateway/pubsub_service.py @@ -21,7 +21,7 @@ from typing import TYPE_CHECKING, cast from twisted.internet import defer from twisted.words.protocols.jabber import error, jid from twisted.words.xish import domish -from wokkel import data_form, disco, pubsub, rsm +from tx_xmpp import data_form, disco, pubsub, rsm from libervia.backend import G from libervia.backend.core import exceptions diff --git a/libervia/backend/plugins/plugin_comp_file_sharing.py b/libervia/backend/plugins/plugin_comp_file_sharing.py index 0eab38d1..f8bdeeb9 100644 --- a/libervia/backend/plugins/plugin_comp_file_sharing.py +++ b/libervia/backend/plugins/plugin_comp_file_sharing.py @@ -45,8 +45,8 @@ from libervia.backend.models.types import JIDType from twisted.internet import defer, reactor from twisted.words.protocols.jabber import error, jid from twisted.web import server, resource, static, http -from wokkel import pubsub -from wokkel import generic +from tx_xmpp import pubsub +from tx_xmpp import generic log = getLogger(__name__) diff --git a/libervia/backend/plugins/plugin_exp_data_policy.py b/libervia/backend/plugins/plugin_exp_data_policy.py index dd7e476d..8edf9ecd 100644 --- a/libervia/backend/plugins/plugin_exp_data_policy.py +++ b/libervia/backend/plugins/plugin_exp_data_policy.py @@ -25,7 +25,7 @@ from typing import get_type_hints from pydantic import BaseModel, ConfigDict, Field, computed_field from twisted.internet import defer from twisted.words.protocols.jabber import jid -from wokkel import data_form +from tx_xmpp import data_form from libervia.backend.core import exceptions from libervia.backend.core.constants import Const as C diff --git a/libervia/backend/plugins/plugin_exp_gre.py b/libervia/backend/plugins/plugin_exp_gre.py index 840a1b0e..f38a3efa 100644 --- a/libervia/backend/plugins/plugin_exp_gre.py +++ b/libervia/backend/plugins/plugin_exp_gre.py @@ -24,7 +24,7 @@ from twisted.words.protocols.jabber import jid, error as jabber_error from twisted.words.protocols.jabber import xmlstream from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import data_form, disco, iwokkel +from tx_xmpp import data_form, disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -354,7 +354,7 @@ class GRE: return GREHandler(self) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class GREHandler(XMPPHandler): def __init__(self, plugin_parent: GRE) -> None: diff --git a/libervia/backend/plugins/plugin_exp_invitation.py b/libervia/backend/plugins/plugin_exp_invitation.py index c357cfc6..53ae9096 100644 --- a/libervia/backend/plugins/plugin_exp_invitation.py +++ b/libervia/backend/plugins/plugin_exp_invitation.py @@ -21,7 +21,7 @@ from zope.interface import implementer from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from libervia.backend.core.i18n import _ from libervia.backend.core import exceptions from libervia.backend.core.constants import Const as C @@ -345,7 +345,7 @@ class Invitation(object): await utils.as_deferred(cb, client, namespace, name, extra, *args) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class PubsubInvitationHandler(XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_exp_list_of_interest.py b/libervia/backend/plugins/plugin_exp_list_of_interest.py index b3db2daf..9ff91981 100644 --- a/libervia/backend/plugins/plugin_exp_list_of_interest.py +++ b/libervia/backend/plugins/plugin_exp_list_of_interest.py @@ -24,7 +24,7 @@ from libervia.backend.core import exceptions from libervia.backend.core.log import getLogger from libervia.backend.tools.common import data_format from libervia.backend.tools.common import uri -from wokkel import disco, iwokkel, pubsub +from tx_xmpp import disco, itx_xmpp, pubsub from zope.interface import implementer from twisted.internet import defer from twisted.words.protocols.jabber import error as jabber_error, jid @@ -333,7 +333,7 @@ class ListInterest(object): raise exceptions.NotFound -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class ListInterestHandler(XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_exp_pubsub_admin.py b/libervia/backend/plugins/plugin_exp_pubsub_admin.py index 932d2701..b09616cc 100644 --- a/libervia/backend/plugins/plugin_exp_pubsub_admin.py +++ b/libervia/backend/plugins/plugin_exp_pubsub_admin.py @@ -23,8 +23,8 @@ from libervia.backend.core.constants import Const as C from libervia.backend.core.log import getLogger from libervia.backend.tools.common import data_format from twisted.words.protocols.jabber import jid -from wokkel import pubsub -from wokkel import generic +from tx_xmpp import pubsub +from tx_xmpp import generic log = getLogger(__name__) diff --git a/libervia/backend/plugins/plugin_misc_groupblog.py b/libervia/backend/plugins/plugin_misc_groupblog.py index f71d3252..157f8417 100644 --- a/libervia/backend/plugins/plugin_misc_groupblog.py +++ b/libervia/backend/plugins/plugin_misc_groupblog.py @@ -27,13 +27,13 @@ from libervia.backend.plugins.plugin_xep_0277 import MbData log = getLogger(__name__) from twisted.internet import defer from libervia.backend.core import exceptions -from wokkel import disco, data_form, iwokkel +from tx_xmpp import disco, data_form, itx_xmpp from zope.interface import implementer try: from twisted.words.protocols.xmlstream import XMPPHandler except ImportError: - from wokkel.subprotocols import XMPPHandler + from tx_xmpp.subprotocols import XMPPHandler NS_PUBSUB = "http://jabber.org/protocol/pubsub" NS_GROUPBLOG = "http://salut-a-toi.org/protocol/groupblog" @@ -154,7 +154,7 @@ class GroupBlog(object): options[self._p.OPT_ROSTER_GROUPS_ALLOWED] = mb_data["groups"] -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class GroupBlog_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_misc_ip.py b/libervia/backend/plugins/plugin_misc_ip.py index c835cc31..2118a7c7 100644 --- a/libervia/backend/plugins/plugin_misc_ip.py +++ b/libervia/backend/plugins/plugin_misc_ip.py @@ -22,7 +22,7 @@ from libervia.backend.core.i18n import _, D_ from libervia.backend.core.constants import Const as C from libervia.backend.core.log import getLogger from libervia.backend.tools import xml_tools -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from twisted.web import client as webclient from twisted.web import error as web_error from twisted.internet import defer @@ -318,7 +318,7 @@ class IPPlugin(object): return ip -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class IPPlugin_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_misc_pubsub_contacts.py b/libervia/backend/plugins/plugin_misc_pubsub_contacts.py index 34ecadb4..1cc8f682 100644 --- a/libervia/backend/plugins/plugin_misc_pubsub_contacts.py +++ b/libervia/backend/plugins/plugin_misc_pubsub_contacts.py @@ -25,8 +25,8 @@ from twisted.internet import defer from twisted.words.protocols.jabber.jid import JID from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco -from wokkel.pubsub import NS_PUBSUB, NS_PUBSUB_EVENT +from tx_xmpp import disco +from tx_xmpp.pubsub import NS_PUBSUB, NS_PUBSUB_EVENT from zope.interface import implementer from libervia.backend.core import exceptions @@ -41,7 +41,7 @@ from libervia.backend.tools.xml_tools import find_ancestor if TYPE_CHECKING: from libervia.backend.core.main import LiberviaBackend - from wokkel.pubsub import ItemsEvent + from tx_xmpp.pubsub import ItemsEvent log = getLogger(__name__) diff --git a/libervia/backend/plugins/plugin_misc_remote_control.py b/libervia/backend/plugins/plugin_misc_remote_control.py index 3a6414aa..812ecaab 100644 --- a/libervia/backend/plugins/plugin_misc_remote_control.py +++ b/libervia/backend/plugins/plugin_misc_remote_control.py @@ -20,7 +20,7 @@ from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -373,7 +373,7 @@ class RemoteControl(BaseApplicationHandler): ) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class RemoteControl_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): return [disco.DiscoFeature(NS_REMOTE_CONTROL)] diff --git a/libervia/backend/plugins/plugin_misc_room_game.py b/libervia/backend/plugins/plugin_misc_room_game.py index de3a5b2b..44078fc3 100644 --- a/libervia/backend/plugins/plugin_misc_room_game.py +++ b/libervia/backend/plugins/plugin_misc_room_game.py @@ -26,14 +26,14 @@ from twisted.words.protocols.jabber import jid from twisted.words.xish import domish from twisted.internet import defer from time import time -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer import copy try: from twisted.words.protocols.xmlstream import XMPPHandler except ImportError: - from wokkel.subprotocols import XMPPHandler + from tx_xmpp.subprotocols import XMPPHandler # Don't forget to set it to False before you commit _DEBUG = False @@ -137,7 +137,7 @@ class RoomGame(object): The game will not be created if one already exists in the room, also its creation could be postponed until all the expected players join the room (in that case it will be created from user_joined_trigger). - @param room (wokkel.muc.Room): the room + @param room (tx_xmpp.muc.Room): the room @param other_players (list[jid.JID]): list of the other players JID (bare) """ # FIXME: broken ! @@ -213,7 +213,7 @@ class RoomGame(object): break else: # TODO: that's not secure enough but what to do if - # wokkel.muc.User's 'entity' attribute is not set?! + # tx_xmpp.muc.User's 'entity' attribute is not set?! if nick in [invited.user for invited in invitations[1]]: auth = True break @@ -411,7 +411,7 @@ class RoomGame(object): def _check_wait_auth(self, room, other_players, verbose=False): """Check if we must wait for other players before starting the game. - @param room (wokkel.muc.Room): the room + @param room (tx_xmpp.muc.Room): the room @param other_players (list[jid.JID]): list of the players without the referee @param verbose (bool): display debug message @return: (x, y, z) with: @@ -498,8 +498,8 @@ class RoomGame(object): def user_joined_trigger(self, room, user, profile): """This trigger is used to check if the new user can take part of a game, create the game if we were waiting for him or just update the players list. - @room: wokkel.muc.Room object. room.roster is a dict{wokkel.muc.User.nick: wokkel.muc.User} - @user: wokkel.muc.User object. user.nick is a unicode and user.entity a JID + @room: tx_xmpp.muc.Room object. room.roster is a dict{tx_xmpp.muc.User.nick: tx_xmpp.muc.User} + @user: tx_xmpp.muc.User object. user.nick is a unicode and user.entity a JID @return: True to not interrupt the main process. """ room_jid = room.occupantJID.userhostJID() @@ -537,8 +537,8 @@ class RoomGame(object): def user_left_trigger(self, room, user, profile): """This trigger is used to update or stop the game when a user leaves. - @room: wokkel.muc.Room object. room.roster is a dict{wokkel.muc.User.nick: wokkel.muc.User} - @user: wokkel.muc.User object. user.nick is a unicode and user.entity a JID + @room: tx_xmpp.muc.Room object. room.roster is a dict{tx_xmpp.muc.User.nick: tx_xmpp.muc.User} + @user: tx_xmpp.muc.User object. user.nick is a unicode and user.entity a JID @return: True to not interrupt the main process. """ room_jid = room.occupantJID.userhostJID() @@ -767,7 +767,7 @@ class RoomGame(object): return RoomGameHandler(self) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class RoomGameHandler(XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_misc_tarot.py b/libervia/backend/plugins/plugin_misc_tarot.py index c28444c7..347a1112 100644 --- a/libervia/backend/plugins/plugin_misc_tarot.py +++ b/libervia/backend/plugins/plugin_misc_tarot.py @@ -25,7 +25,7 @@ log = getLogger(__name__) from twisted.words.xish import domish from twisted.words.protocols.jabber import jid from twisted.internet import defer -from wokkel import data_form +from tx_xmpp import data_form from libervia.backend.memory import memory from libervia.backend.tools import xml_tools diff --git a/libervia/backend/plugins/plugin_pubsub_cache.py b/libervia/backend/plugins/plugin_pubsub_cache.py index 71483069..9c485df2 100644 --- a/libervia/backend/plugins/plugin_pubsub_cache.py +++ b/libervia/backend/plugins/plugin_pubsub_cache.py @@ -22,7 +22,7 @@ from typing import Optional, List, Tuple, Dict, Any, cast from twisted.words.protocols.jabber import jid, error from twisted.words.xish import domish from twisted.internet import defer -from wokkel import pubsub, rsm +from tx_xmpp import pubsub, rsm from libervia.backend import G from libervia.backend.core.i18n import _ from libervia.backend.core.constants import Const as C diff --git a/libervia/backend/plugins/plugin_sec_gre_encrypter_openpgp.py b/libervia/backend/plugins/plugin_sec_gre_encrypter_openpgp.py index e7625017..61b67116 100644 --- a/libervia/backend/plugins/plugin_sec_gre_encrypter_openpgp.py +++ b/libervia/backend/plugins/plugin_sec_gre_encrypter_openpgp.py @@ -22,7 +22,7 @@ from typing import Final, TYPE_CHECKING, cast from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import data_form, disco, iwokkel +from tx_xmpp import data_form, disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -87,7 +87,7 @@ class GREEncrypterOpenPGP(Encrypter): return base64.b64encode(encrypted_data).decode("ASCII") -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class GREMIMEHandler(XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_sec_gre_formatter_mime.py b/libervia/backend/plugins/plugin_sec_gre_formatter_mime.py index a3c77046..34ef0968 100644 --- a/libervia/backend/plugins/plugin_sec_gre_formatter_mime.py +++ b/libervia/backend/plugins/plugin_sec_gre_formatter_mime.py @@ -21,7 +21,7 @@ from typing import Final, TYPE_CHECKING, cast from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import data_form, disco, iwokkel +from tx_xmpp import data_form, disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -108,7 +108,7 @@ class GREFormatterMime(Formatter): return msg.as_bytes() -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class GREMIMEHandler(XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0004.py b/libervia/backend/plugins/plugin_xep_0004.py index 03adce08..02070655 100644 --- a/libervia/backend/plugins/plugin_xep_0004.py +++ b/libervia/backend/plugins/plugin_xep_0004.py @@ -23,7 +23,7 @@ from pydantic import BaseModel, Field from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import data_form, disco +from tx_xmpp import data_form, disco from zope.interface import implementer from libervia.backend.core import exceptions @@ -172,7 +172,7 @@ class DataForm(BaseModel): raise KeyError(f"Field '{field_var}' not found in data form") @classmethod - def from_wokkel_form( + def from_tx_xmpp_form( cls, form: data_form.Form, source_form: Self | None = None ) -> Self: """Convert Wokkel Form to DataForm. @@ -277,7 +277,7 @@ class DataForm(BaseModel): fields=fields, ) - def to_wokkel_form(self) -> data_form.Form: + def to_tx_xmpp_form(self) -> data_form.Form: """Convert DataForm to Wokkel Form.""" form = data_form.Form( formType=self.type, @@ -315,7 +315,7 @@ class DataForm(BaseModel): descendant. @param element: Element to parse, it must be a data form, or have a child which is a data form. - @param source_form: Original form for submitted forms. See [from_wokkel_form]. + @param source_form: Original form for submitted forms. See [from_tx_xmpp_form]. @return: Instance of DataForm. @raise exceptions.NotFound: No data form found in ``element`` or one of its descendants. @@ -328,11 +328,11 @@ class DataForm(BaseModel): f"No data form found in {element} or its descendants." ) form = data_form.Form.fromElement(element) - return cls.from_wokkel_form(form, source_form=source_form) + return cls.from_tx_xmpp_form(form, source_form=source_form) def to_element(self) -> domish.Element: """Generate the element corresponding to this form.""" - return self.to_wokkel_form().toElement() + return self.to_tx_xmpp_form().toElement() class XEP_0004: diff --git a/libervia/backend/plugins/plugin_xep_0020.py b/libervia/backend/plugins/plugin_xep_0020.py index ff137dd0..e98df1ab 100644 --- a/libervia/backend/plugins/plugin_xep_0020.py +++ b/libervia/backend/plugins/plugin_xep_0020.py @@ -30,9 +30,9 @@ from zope.interface import implementer try: from twisted.words.protocols.xmlstream import XMPPHandler except ImportError: - from wokkel.subprotocols import XMPPHandler + from tx_xmpp.subprotocols import XMPPHandler -from wokkel import disco, iwokkel, data_form +from tx_xmpp import disco, itx_xmpp, data_form NS_FEATURE_NEG = "http://jabber.org/protocol/feature-neg" @@ -156,7 +156,7 @@ class XEP_0020(object): return feature_elt -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0020_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0033.py b/libervia/backend/plugins/plugin_xep_0033.py index e69fe8ee..94559574 100644 --- a/libervia/backend/plugins/plugin_xep_0033.py +++ b/libervia/backend/plugins/plugin_xep_0033.py @@ -24,7 +24,7 @@ from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -519,7 +519,7 @@ class XEP_0033: return XEP_0033_handler() -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0033_handler(XMPPHandler): def getDiscoInfo( diff --git a/libervia/backend/plugins/plugin_xep_0045.py b/libervia/backend/plugins/plugin_xep_0045.py index 9d9e7721..a63a8932 100644 --- a/libervia/backend/plugins/plugin_xep_0045.py +++ b/libervia/backend/plugins/plugin_xep_0045.py @@ -28,9 +28,9 @@ from twisted.internet import defer from twisted.python import failure from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber import error as xmpp_error -from wokkel import disco, iwokkel, muc -from wokkel import rsm -from wokkel import mam +from tx_xmpp import disco, itx_xmpp, muc +from tx_xmpp import rsm +from tx_xmpp import mam from zope.interface import implementer from libervia.backend import G @@ -1105,7 +1105,7 @@ class XEP_0045: return True -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class LiberviaMUCClient(muc.MUCClient): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0047.py b/libervia/backend/plugins/plugin_xep_0047.py index 30b1271b..a0294b49 100644 --- a/libervia/backend/plugins/plugin_xep_0047.py +++ b/libervia/backend/plugins/plugin_xep_0047.py @@ -30,7 +30,7 @@ from twisted.internet import reactor from twisted.internet import defer from twisted.python import failure -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer @@ -39,7 +39,7 @@ import base64 try: from twisted.words.protocols.xmlstream import XMPPHandler except ImportError: - from wokkel.subprotocols import XMPPHandler + from tx_xmpp.subprotocols import XMPPHandler MESSAGE = "/message" IQ_SET = '/iq[@type="set"]' @@ -373,7 +373,7 @@ class XEP_0047(object): self._kill_session(session_data["id"], client, failure_reason) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0047_handler(XMPPHandler): def __init__(self, parent): diff --git a/libervia/backend/plugins/plugin_xep_0049.py b/libervia/backend/plugins/plugin_xep_0049.py index ee9f3588..352d478d 100644 --- a/libervia/backend/plugins/plugin_xep_0049.py +++ b/libervia/backend/plugins/plugin_xep_0049.py @@ -22,7 +22,7 @@ from libervia.backend.core.constants import Const as C from libervia.backend.core.log import getLogger log = getLogger(__name__) -from wokkel import compat +from tx_xmpp import compat from twisted.words.xish import domish PLUGIN_INFO = { diff --git a/libervia/backend/plugins/plugin_xep_0050.py b/libervia/backend/plugins/plugin_xep_0050.py index 2c31b636..0cc21f9c 100644 --- a/libervia/backend/plugins/plugin_xep_0050.py +++ b/libervia/backend/plugins/plugin_xep_0050.py @@ -29,7 +29,7 @@ from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.error import StanzaError from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import data_form, disco, iwokkel +from tx_xmpp import data_form, disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -334,7 +334,7 @@ class AdHocCommand(BaseModel): raise ValueError('"str" or "Callable are expected for "callback".') -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class AdHocCommandHandler(XMPPHandler): """Implementation of an Ad-Hoc Command handler for XMPP. @@ -1212,7 +1212,7 @@ class XEP_0050: ) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0050_handler(XMPPHandler): def __init__(self, plugin_parent): self.plugin_parent = plugin_parent diff --git a/libervia/backend/plugins/plugin_xep_0054.py b/libervia/backend/plugins/plugin_xep_0054.py index db6c3f1c..50de21fb 100644 --- a/libervia/backend/plugins/plugin_xep_0054.py +++ b/libervia/backend/plugins/plugin_xep_0054.py @@ -27,7 +27,7 @@ from twisted.internet import threads, defer from twisted.words.protocols.jabber import jid, error from twisted.words.xish import domish from twisted.python.failure import Failure -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from libervia.backend.core import exceptions from libervia.backend.core.i18n import _ from libervia.backend.core.constants import Const as C @@ -370,7 +370,7 @@ class XEP_0054(object): await iq_elt.send() -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0054_handler(XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0055.py b/libervia/backend/plugins/plugin_xep_0055.py index dc7fa808..47b388fa 100644 --- a/libervia/backend/plugins/plugin_xep_0055.py +++ b/libervia/backend/plugins/plugin_xep_0055.py @@ -29,12 +29,12 @@ log = getLogger(__name__) from twisted.words.protocols.jabber.xmlstream import IQ, XMPPHandler from twisted.words.protocols.jabber import jid from twisted.internet import defer -from wokkel import data_form +from tx_xmpp import data_form from libervia.backend.core.constants import Const as C from libervia.backend.core.exceptions import DataError from libervia.backend.tools import xml_tools -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer @@ -297,7 +297,7 @@ class XEP_0055: xml_tools.data_form_2_widgets(main_ui, data_form.Form.fromElement(form_elt)) # refill the submitted values - # FIXME: wokkel's data_form.Form.fromElement doesn't parse the values, so we do it directly in XMLUI for now + # FIXME: tx_xmpp's data_form.Form.fromElement doesn't parse the values, so we do it directly in XMLUI for now for widget in main_ui.current_container.elem.childNodes: name = widget.getAttribute("name") if adv_data.get(name): @@ -519,7 +519,7 @@ class XEP_0055: raise failure -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0055_handler(XMPPHandler): def __init__(self, plugin_parent, profile): diff --git a/libervia/backend/plugins/plugin_xep_0059.py b/libervia/backend/plugins/plugin_xep_0059.py index 569722ea..7e628b17 100644 --- a/libervia/backend/plugins/plugin_xep_0059.py +++ b/libervia/backend/plugins/plugin_xep_0059.py @@ -22,7 +22,7 @@ from pydantic import BaseModel, Field, field_validator from zope.interface import implementer from twisted.words.protocols.jabber import xmlstream from twisted.words.xish import domish -from wokkel import disco, iwokkel, rsm +from tx_xmpp import disco, itx_xmpp, rsm from libervia.backend.core.i18n import _ from libervia.backend.core.constants import Const as C from libervia.backend.core.log import getLogger @@ -65,20 +65,20 @@ class RSMRequest(BaseModel): raise ValueError('RSM "after" can\'t be empty') return v - def to_wokkel_request(self) -> rsm.RSMRequest: - """Convert to wokkel RSMRequest + def to_tx_xmpp_request(self) -> rsm.RSMRequest: + """Convert to tx_xmpp RSMRequest - @return: wokkel RSMRequest instance + @return: tx_xmpp RSMRequest instance """ return rsm.RSMRequest( max_=self.max, after=self.after, before=self.before, index=self.index ) @classmethod - def from_wokkel_request(cls, request: rsm.RSMRequest) -> Self: - """Create from wokkel RSMRequest + def from_tx_xmpp_request(cls, request: rsm.RSMRequest) -> Self: + """Create from tx_xmpp RSMRequest - @param request: wokkel RSMRequest to convert + @param request: tx_xmpp RSMRequest to convert @return: RSMRequestModel instance """ return cls( @@ -93,7 +93,7 @@ class RSMRequest(BaseModel): @return: XML element representing the RSM request """ - return self.to_wokkel_request().toElement() + return self.to_tx_xmpp_request().toElement() @classmethod def from_element(cls, element: domish.Element) -> Self: @@ -104,12 +104,12 @@ class RSMRequest(BaseModel): @raise ValueError: if the element is invalid """ try: - wokkel_req = rsm.RSMRequest.fromElement(element) + tx_xmpp_req = rsm.RSMRequest.fromElement(element) except rsm.RSMNotFoundError: raise ValueError("No RSM set element found") except rsm.RSMError as e: raise ValueError(str(e)) - return cls.from_wokkel_request(wokkel_req) + return cls.from_tx_xmpp_request(tx_xmpp_req) class RSMResponse(BaseModel): @@ -120,20 +120,20 @@ class RSMResponse(BaseModel): index: int | None = None count: int | None = None - def to_wokkel_response(self) -> rsm.RSMResponse: - """Convert to wokkel RSMResponse + def to_tx_xmpp_response(self) -> rsm.RSMResponse: + """Convert to tx_xmpp RSMResponse - @return: wokkel RSMResponse instance + @return: tx_xmpp RSMResponse instance """ return rsm.RSMResponse( first=self.first, last=self.last, index=self.index, count=self.count ) @classmethod - def from_wokkel_response(cls, response: rsm.RSMResponse) -> Self: - """Create from wokkel RSMResponse + def from_tx_xmpp_response(cls, response: rsm.RSMResponse) -> Self: + """Create from tx_xmpp RSMResponse - @param response: wokkel RSMResponse to convert + @param response: tx_xmpp RSMResponse to convert @return: RSMResponseModel instance """ return cls( @@ -148,7 +148,7 @@ class RSMResponse(BaseModel): @return: XML element representing the RSM response """ - return self.to_wokkel_response().toElement() + return self.to_tx_xmpp_response().toElement() @classmethod def from_element(cls, element: domish.Element) -> Self: @@ -159,12 +159,12 @@ class RSMResponse(BaseModel): @raise ValueError: if the element is invalid """ try: - wokkel_resp = rsm.RSMResponse.fromElement(element) + tx_xmpp_resp = rsm.RSMResponse.fromElement(element) except rsm.RSMNotFoundError: raise ValueError("No RSM set element found") except rsm.RSMError as e: raise ValueError(str(e)) - return cls.from_wokkel_response(wokkel_resp) + return cls.from_tx_xmpp_response(tx_xmpp_resp) class XEP_0059: @@ -200,7 +200,7 @@ class XEP_0059: except KeyError: continue - return RSMRequest(**rsm_args).to_wokkel_request() if rsm_args else None + return RSMRequest(**rsm_args).to_tx_xmpp_request() if rsm_args else None def response2dict( self, rsm_response: rsm.RSMResponse, data: dict[str, str] | None = None @@ -223,7 +223,7 @@ class XEP_0059: # XEP-0313 plugin. if data is None: data = {} - model = RSMResponse.from_wokkel_response(rsm_response) + model = RSMResponse.from_tx_xmpp_response(rsm_response) if model.first is not None: data["first"] = model.first @@ -276,7 +276,7 @@ class XEP_0059: return RSMRequest(max=rsm_request.max, after=rsm_response.last) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0059_handler(xmlstream.XMPPHandler): def getDiscoInfo( self, requestor: str, target: str, nodeIdentifier: str = "" diff --git a/libervia/backend/plugins/plugin_xep_0060.py b/libervia/backend/plugins/plugin_xep_0060.py index 4ffb70d0..90b97e31 100644 --- a/libervia/backend/plugins/plugin_xep_0060.py +++ b/libervia/backend/plugins/plugin_xep_0060.py @@ -39,11 +39,11 @@ from pydantic import BaseModel, ConfigDict, Field from twisted.internet import defer, reactor from twisted.words.protocols.jabber import error, jid from twisted.words.xish import domish -from wokkel import disco -from wokkel import data_form -from wokkel import pubsub -from wokkel import rsm -from wokkel import mam +from tx_xmpp import disco +from tx_xmpp import data_form +from tx_xmpp import pubsub +from tx_xmpp import rsm +from tx_xmpp import mam from zope.interface import implementer from libervia.backend import G @@ -995,17 +995,17 @@ class XEP_0060: - service, node: service and node used """ if rsm_request is not None: - # For the moment we convert RSMRequest to wokkel rsm.RSMRequest for backward + # For the moment we convert RSMRequest to tx_xmpp rsm.RSMRequest for backward # compatibility with other plugins. In the future we should work as much as # possible with XEP-0059's plugin RSMRequest, and convert to Wokkel - # rsm.RSMRequest only when we need to work with wokkel directly. + # rsm.RSMRequest only when we need to work with tx_xmpp directly. if isinstance(rsm_request, rsm.RSMRequest): log.warning( "Use of rsm.RSMRequest is deprecated, use plugin_xep_0059.RSMRequest " "instead." ) else: - rsm_request = rsm_request.to_wokkel_request() + rsm_request = rsm_request.to_tx_xmpp_request() if item_ids and max_items is not None: max_items = None if rsm_request and item_ids: diff --git a/libervia/backend/plugins/plugin_xep_0065.py b/libervia/backend/plugins/plugin_xep_0065.py index 8567a42c..c4fb0627 100644 --- a/libervia/backend/plugins/plugin_xep_0065.py +++ b/libervia/backend/plugins/plugin_xep_0065.py @@ -66,7 +66,7 @@ from twisted.words.protocols.jabber import error as jabber_error from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber import xmlstream from twisted.internet import defer -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from libervia.backend.core.i18n import _ from libervia.backend.core.log import getLogger from libervia.backend.core.constants import Const as C @@ -1396,7 +1396,7 @@ class XEP_0065(object): client.send(result_elt) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0065_handler(xmlstream.XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0070.py b/libervia/backend/plugins/plugin_xep_0070.py index 66622899..e2fe2c34 100644 --- a/libervia/backend/plugins/plugin_xep_0070.py +++ b/libervia/backend/plugins/plugin_xep_0070.py @@ -25,13 +25,13 @@ from twisted.words.protocols import jabber log = getLogger(__name__) from libervia.backend.tools import xml_tools -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer try: from twisted.words.protocols.xmlstream import XMPPHandler except ImportError: - from wokkel.subprotocols import XMPPHandler + from tx_xmpp.subprotocols import XMPPHandler NS_HTTP_AUTH = "http://jabber.org/protocol/http-auth" @@ -132,7 +132,7 @@ class XEP_0070(object): client.send(result_elt) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0070_handler(XMPPHandler): def __init__(self, plugin_parent, profile): diff --git a/libervia/backend/plugins/plugin_xep_0071.py b/libervia/backend/plugins/plugin_xep_0071.py index 67618c17..9b86ba3c 100644 --- a/libervia/backend/plugins/plugin_xep_0071.py +++ b/libervia/backend/plugins/plugin_xep_0071.py @@ -26,7 +26,7 @@ log = getLogger(__name__) from libervia.backend.tools.common import data_format from twisted.internet import defer -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer # from lxml import etree @@ -39,7 +39,7 @@ except ImportError: try: from twisted.words.protocols.xmlstream import XMPPHandler except ImportError: - from wokkel.subprotocols import XMPPHandler + from tx_xmpp.subprotocols import XMPPHandler NS_XHTML_IM = "http://jabber.org/protocol/xhtml-im" NS_XHTML = "http://www.w3.org/1999/xhtml" @@ -295,7 +295,7 @@ class XEP_0071(object): return html.tostring(root_elt, encoding="unicode", method="xml") -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0071_handler(XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0077.py b/libervia/backend/plugins/plugin_xep_0077.py index 8b665392..3585533b 100644 --- a/libervia/backend/plugins/plugin_xep_0077.py +++ b/libervia/backend/plugins/plugin_xep_0077.py @@ -29,7 +29,7 @@ from twisted.words.protocols.jabber import ( xmlstream as xmlstream_mod, ) from twisted.words.xish import domish -from wokkel import data_form, disco, iwokkel +from tx_xmpp import data_form, disco, itx_xmpp from zope.interface import implementer from libervia.backend import G @@ -536,7 +536,7 @@ class XEP_0077: return d -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0077_handler(xmlstream_mod.XMPPHandler): def __init__(self, plugin_parent: XEP_0077) -> None: diff --git a/libervia/backend/plugins/plugin_xep_0084.py b/libervia/backend/plugins/plugin_xep_0084.py index 29fb2d65..7adad415 100644 --- a/libervia/backend/plugins/plugin_xep_0084.py +++ b/libervia/backend/plugins/plugin_xep_0084.py @@ -25,7 +25,7 @@ from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.protocols.jabber import jid, error from twisted.words.xish import domish from zope.interface import implementer -from wokkel import disco, iwokkel, pubsub +from tx_xmpp import disco, itx_xmpp, pubsub from libervia.backend.core.constants import Const as C from libervia.backend.core.i18n import _ @@ -232,7 +232,7 @@ class XEP_0084: await self._p.send_items(client, service, NS_AVATAR_METADATA, [item_metadata_elt]) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0084_Handler(XMPPHandler): def getDiscoInfo(self, requestor, service, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0085.py b/libervia/backend/plugins/plugin_xep_0085.py index c6408972..c575eed3 100644 --- a/libervia/backend/plugins/plugin_xep_0085.py +++ b/libervia/backend/plugins/plugin_xep_0085.py @@ -23,7 +23,7 @@ from libervia.backend.core import exceptions from libervia.backend.core.log import getLogger log = getLogger(__name__) -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from twisted.words.protocols.jabber.jid import JID @@ -416,7 +416,7 @@ class ChatStateMachine(object): ) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0085_handler(XMPPHandler): def __init__(self, plugin_parent, profile): diff --git a/libervia/backend/plugins/plugin_xep_0092.py b/libervia/backend/plugins/plugin_xep_0092.py index 0aa4b7c3..137058ec 100644 --- a/libervia/backend/plugins/plugin_xep_0092.py +++ b/libervia/backend/plugins/plugin_xep_0092.py @@ -21,7 +21,7 @@ from typing import Tuple from twisted.internet import defer, reactor from twisted.words.protocols.jabber import jid -from wokkel import compat +from tx_xmpp import compat from libervia.backend.core import exceptions from libervia.backend.core.constants import Const as C diff --git a/libervia/backend/plugins/plugin_xep_0095.py b/libervia/backend/plugins/plugin_xep_0095.py index f4a31140..8402231f 100644 --- a/libervia/backend/plugins/plugin_xep_0095.py +++ b/libervia/backend/plugins/plugin_xep_0095.py @@ -26,8 +26,8 @@ from libervia.backend.core import exceptions from twisted.words.protocols.jabber import xmlstream from twisted.words.protocols.jabber import error from zope.interface import implementer -from wokkel import disco -from wokkel import iwokkel +from tx_xmpp import disco +from tx_xmpp import itx_xmpp import uuid PLUGIN_INFO = { @@ -181,7 +181,7 @@ class XEP_0095(object): return sid, offer_d -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0095_handler(xmlstream.XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0100.py b/libervia/backend/plugins/plugin_xep_0100.py index cb1d143f..4b521e77 100644 --- a/libervia/backend/plugins/plugin_xep_0100.py +++ b/libervia/backend/plugins/plugin_xep_0100.py @@ -21,7 +21,7 @@ from typing import cast from pydantic import BaseModel, Field from twisted.internet import defer, reactor from twisted.words.protocols.jabber import jid -from wokkel import disco +from tx_xmpp import disco from libervia.backend.core import exceptions from libervia.backend.core.constants import Const as C diff --git a/libervia/backend/plugins/plugin_xep_0106.py b/libervia/backend/plugins/plugin_xep_0106.py index 1d9a9d26..7e41b574 100644 --- a/libervia/backend/plugins/plugin_xep_0106.py +++ b/libervia/backend/plugins/plugin_xep_0106.py @@ -22,7 +22,7 @@ from libervia.backend.core.constants import Const as C from libervia.backend.core.log import getLogger from twisted.words.protocols.jabber import xmlstream from zope.interface import implementer -from wokkel import disco +from tx_xmpp import disco log = getLogger(__name__) diff --git a/libervia/backend/plugins/plugin_xep_0115.py b/libervia/backend/plugins/plugin_xep_0115.py index bb5e3b5d..409ea892 100644 --- a/libervia/backend/plugins/plugin_xep_0115.py +++ b/libervia/backend/plugins/plugin_xep_0115.py @@ -26,12 +26,12 @@ from twisted.words.xish import domish from twisted.words.protocols.jabber import jid from twisted.internet import defer, error from zope.interface import implementer -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp try: from twisted.words.protocols.xmlstream import XMPPHandler except ImportError: - from wokkel.subprotocols import XMPPHandler + from tx_xmpp.subprotocols import XMPPHandler PRESENCE = "/presence" NS_ENTITY_CAPABILITY = "http://jabber.org/protocol/caps" @@ -115,7 +115,7 @@ class XEP_0115(object): return True -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0115_handler(XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0131.py b/libervia/backend/plugins/plugin_xep_0131.py index e344bc22..d921f247 100644 --- a/libervia/backend/plugins/plugin_xep_0131.py +++ b/libervia/backend/plugins/plugin_xep_0131.py @@ -25,7 +25,7 @@ from pydantic import BaseModel, ConfigDict, Field, RootModel from twisted.internet import defer from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco +from tx_xmpp import disco from zope.interface import implementer from libervia.backend.core import exceptions diff --git a/libervia/backend/plugins/plugin_xep_0163.py b/libervia/backend/plugins/plugin_xep_0163.py index 9d866fdd..b2cd1ee6 100644 --- a/libervia/backend/plugins/plugin_xep_0163.py +++ b/libervia/backend/plugins/plugin_xep_0163.py @@ -28,8 +28,8 @@ from libervia.backend.core.log import getLogger from twisted.words.xish import domish -from wokkel import disco, pubsub -from wokkel.formats import Mood +from tx_xmpp import disco, pubsub +from tx_xmpp.formats import Mood from libervia.backend.tools.common import data_format from libervia.backend.tools import utils @@ -201,7 +201,7 @@ class XEP_0163(object): class UserMood(Mood, domish.Element): - """Improved wokkel Mood which is also a domish.Element""" + """Improved tx_xmpp Mood which is also a domish.Element""" def __init__(self, value, text=None): Mood.__init__(self, value, text) diff --git a/libervia/backend/plugins/plugin_xep_0166/__init__.py b/libervia/backend/plugins/plugin_xep_0166/__init__.py index 412f6914..92c19397 100644 --- a/libervia/backend/plugins/plugin_xep_0166/__init__.py +++ b/libervia/backend/plugins/plugin_xep_0166/__init__.py @@ -28,7 +28,7 @@ from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber import error from twisted.words.protocols.jabber import xmlstream from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -1573,7 +1573,7 @@ class XEP_0166: ) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0166_handler(xmlstream.XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0167/__init__.py b/libervia/backend/plugins/plugin_xep_0167/__init__.py index cd3fe844..3baf2b55 100644 --- a/libervia/backend/plugins/plugin_xep_0167/__init__.py +++ b/libervia/backend/plugins/plugin_xep_0167/__init__.py @@ -23,7 +23,7 @@ from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -802,7 +802,7 @@ class XEP_0167(BaseApplicationHandler): ) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0167_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): return [ diff --git a/libervia/backend/plugins/plugin_xep_0176.py b/libervia/backend/plugins/plugin_xep_0176.py index 0b8fa940..b0c08d56 100644 --- a/libervia/backend/plugins/plugin_xep_0176.py +++ b/libervia/backend/plugins/plugin_xep_0176.py @@ -22,7 +22,7 @@ import uuid from twisted.internet import defer from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -487,7 +487,7 @@ class XEP_0176(BaseTransportHandler): log.warning(f"Could not send new ICE candidates: {e}") -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0176_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): return [disco.DiscoFeature(NS_JINGLE_ICE_UDP)] diff --git a/libervia/backend/plugins/plugin_xep_0184.py b/libervia/backend/plugins/plugin_xep_0184.py index a4eb5eb3..9b63c94c 100644 --- a/libervia/backend/plugins/plugin_xep_0184.py +++ b/libervia/backend/plugins/plugin_xep_0184.py @@ -25,13 +25,13 @@ from twisted.words.xish import domish log = getLogger(__name__) -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer try: from twisted.words.protocols.xmlstream import XMPPHandler except ImportError: - from wokkel.subprotocols import XMPPHandler + from tx_xmpp.subprotocols import XMPPHandler NS_MESSAGE_DELIVERY_RECEIPTS = "urn:xmpp:receipts" @@ -199,7 +199,7 @@ class XEP_0184(object): return self.host.memory.param_get_a(PARAM_NAME, PARAM_KEY, profile_key=profile) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0184_handler(XMPPHandler): def __init__(self, plugin_parent, profile): diff --git a/libervia/backend/plugins/plugin_xep_0191.py b/libervia/backend/plugins/plugin_xep_0191.py index 460126c1..35c3f15d 100644 --- a/libervia/backend/plugins/plugin_xep_0191.py +++ b/libervia/backend/plugins/plugin_xep_0191.py @@ -22,7 +22,7 @@ from twisted.words.protocols.jabber import xmlstream, jid from twisted.words.xish import domish from twisted.internet import defer from zope.interface import implementer -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from libervia.backend.core.constants import Const as C from libervia.backend.core.i18n import _ @@ -171,7 +171,7 @@ class XEP_0191: client.send(iq_result_elt) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0191_Handler(xmlstream.XMPPHandler): def __init__(self, plugin_parent: XEP_0191): diff --git a/libervia/backend/plugins/plugin_xep_0198.py b/libervia/backend/plugins/plugin_xep_0198.py index ef8d3fd2..1d1280c8 100644 --- a/libervia/backend/plugins/plugin_xep_0198.py +++ b/libervia/backend/plugins/plugin_xep_0198.py @@ -27,7 +27,7 @@ from twisted.words.xish import domish from twisted.internet import defer from twisted.internet import task, reactor from functools import partial -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer import collections import time @@ -561,7 +561,7 @@ class XEP_0198(object): client._xep_0198_session.req_timer = None -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0198_handler(xmlstream.XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0199.py b/libervia/backend/plugins/plugin_xep_0199.py index 8c3a4e3f..31500abb 100644 --- a/libervia/backend/plugins/plugin_xep_0199.py +++ b/libervia/backend/plugins/plugin_xep_0199.py @@ -23,7 +23,7 @@ from libervia.backend.core.log import getLogger log = getLogger(__name__) from libervia.backend.core.constants import Const as C -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from twisted.words.protocols.jabber import xmlstream, jid from zope.interface import implementer import time @@ -150,7 +150,7 @@ class XEP_0199(object): client.send(iq_result_elt) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0199_handler(xmlstream.XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0203.py b/libervia/backend/plugins/plugin_xep_0203.py index dc14036e..00a23763 100644 --- a/libervia/backend/plugins/plugin_xep_0203.py +++ b/libervia/backend/plugins/plugin_xep_0203.py @@ -24,12 +24,12 @@ from libervia.backend.core.log import getLogger log = getLogger(__name__) -from wokkel import disco, iwokkel, delay +from tx_xmpp import disco, itx_xmpp, delay try: from twisted.words.protocols.xmlstream import XMPPHandler except ImportError: - from wokkel.subprotocols import XMPPHandler + from tx_xmpp.subprotocols import XMPPHandler from zope.interface import implementer NS_DD = "urn:xmpp:delay" @@ -70,7 +70,7 @@ class XEP_0203(object): return elt -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0203_handler(XMPPHandler): def __init__(self, plugin_parent, profile): diff --git a/libervia/backend/plugins/plugin_xep_0215.py b/libervia/backend/plugins/plugin_xep_0215.py index 0dca465a..7dbdb941 100644 --- a/libervia/backend/plugins/plugin_xep_0215.py +++ b/libervia/backend/plugins/plugin_xep_0215.py @@ -22,7 +22,7 @@ from twisted.internet import defer from twisted.words.protocols.jabber import error, jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import data_form, disco, iwokkel +from tx_xmpp import data_form, disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -311,7 +311,7 @@ class XEP_0215: log.warning(f"unknown action for services push, ignoring: {action!r}") -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0215_handler(XMPPHandler): def __init__(self, plugin_parent): self.plugin_parent = plugin_parent diff --git a/libervia/backend/plugins/plugin_xep_0231.py b/libervia/backend/plugins/plugin_xep_0231.py index 206b252a..087459bd 100644 --- a/libervia/backend/plugins/plugin_xep_0231.py +++ b/libervia/backend/plugins/plugin_xep_0231.py @@ -27,7 +27,7 @@ from twisted.words.protocols.jabber import xmlstream from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber import error as jabber_error from twisted.internet import defer -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from libervia.backend.tools import xml_tools from libervia.backend.core.i18n import _ from libervia.backend.core.constants import Const as C @@ -231,7 +231,7 @@ class XEP_0231(object): return self.request_data(client, peer_jid, cid) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0231_handler(xmlstream.XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0234.py b/libervia/backend/plugins/plugin_xep_0234.py index a9087ffe..148138b6 100644 --- a/libervia/backend/plugins/plugin_xep_0234.py +++ b/libervia/backend/plugins/plugin_xep_0234.py @@ -27,7 +27,7 @@ from twisted.python import failure from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -1110,7 +1110,7 @@ class XEP_0234(BaseApplicationHandler): ) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0234_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0249.py b/libervia/backend/plugins/plugin_xep_0249.py index d453a519..1671bf3f 100644 --- a/libervia/backend/plugins/plugin_xep_0249.py +++ b/libervia/backend/plugins/plugin_xep_0249.py @@ -20,7 +20,7 @@ from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -36,7 +36,7 @@ log = getLogger(__name__) try: from twisted.words.protocols.xmlstream import XMPPHandler except ImportError: - from wokkel.subprotocols import XMPPHandler + from tx_xmpp.subprotocols import XMPPHandler MESSAGE = "/message" NS_X_CONFERENCE = "jabber:x:conference" @@ -245,7 +245,7 @@ class XEP_0249: return False -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0249_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0260.py b/libervia/backend/plugins/plugin_xep_0260.py index d3004d1c..20883305 100644 --- a/libervia/backend/plugins/plugin_xep_0260.py +++ b/libervia/backend/plugins/plugin_xep_0260.py @@ -24,7 +24,7 @@ from libervia.backend.plugins.plugin_xep_0166.models import BaseTransportHandler log = getLogger(__name__) from libervia.backend.core import exceptions -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from twisted.words.xish import domish from twisted.words.protocols.jabber import jid @@ -34,7 +34,7 @@ import uuid try: from twisted.words.protocols.xmlstream import XMPPHandler except ImportError: - from wokkel.subprotocols import XMPPHandler + from tx_xmpp.subprotocols import XMPPHandler NS_JINGLE_S5B = "urn:xmpp:jingle:transports:s5b:1" @@ -545,7 +545,7 @@ class XEP_0260(BaseTransportHandler): return d -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0260_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0261.py b/libervia/backend/plugins/plugin_xep_0261.py index df7f9aec..ac86f6db 100644 --- a/libervia/backend/plugins/plugin_xep_0261.py +++ b/libervia/backend/plugins/plugin_xep_0261.py @@ -23,7 +23,7 @@ from libervia.backend.core.log import getLogger from libervia.backend.plugins.plugin_xep_0166.models import BaseTransportHandler log = getLogger(__name__) -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from twisted.words.xish import domish import uuid @@ -31,7 +31,7 @@ import uuid try: from twisted.words.protocols.xmlstream import XMPPHandler except ImportError: - from wokkel.subprotocols import XMPPHandler + from tx_xmpp.subprotocols import XMPPHandler NS_JINGLE_IBB = "urn:xmpp:jingle:transports:ibb:1" @@ -105,7 +105,7 @@ class XEP_0261(BaseTransportHandler): return transport_elt -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0261_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0264.py b/libervia/backend/plugins/plugin_xep_0264.py index 87cf3fc6..12292ccf 100644 --- a/libervia/backend/plugins/plugin_xep_0264.py +++ b/libervia/backend/plugins/plugin_xep_0264.py @@ -28,7 +28,7 @@ from twisted.internet import defer, threads from zope.interface import implementer -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from libervia.backend.core import exceptions import hashlib @@ -206,7 +206,7 @@ class XEP_0264(object): ) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0264_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0272.py b/libervia/backend/plugins/plugin_xep_0272.py index 74ef9434..2697a073 100644 --- a/libervia/backend/plugins/plugin_xep_0272.py +++ b/libervia/backend/plugins/plugin_xep_0272.py @@ -19,8 +19,8 @@ from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel -from wokkel import muc +from tx_xmpp import disco, itx_xmpp +from tx_xmpp import muc from zope.interface import implementer from libervia.backend.core import exceptions @@ -310,7 +310,7 @@ class XEP_0272: return {"room_jid": room_jid.full()} -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0272_handler(XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0277.py b/libervia/backend/plugins/plugin_xep_0277.py index 2f9ca2a1..927520c8 100644 --- a/libervia/backend/plugins/plugin_xep_0277.py +++ b/libervia/backend/plugins/plugin_xep_0277.py @@ -34,8 +34,8 @@ from twisted.words.xish import domish from twisted.internet import defer from twisted.python import failure -from wokkel import pubsub -from wokkel import disco, iwokkel, rsm +from tx_xmpp import pubsub +from tx_xmpp import disco, itx_xmpp, rsm from zope.interface import implementer from libervia.backend import G @@ -2085,7 +2085,7 @@ class XEP_0277: return self.rt_sessions.new_session(deferreds, client.profile) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0277_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0280.py b/libervia/backend/plugins/plugin_xep_0280.py index 9dbc9d1c..77fca426 100644 --- a/libervia/backend/plugins/plugin_xep_0280.py +++ b/libervia/backend/plugins/plugin_xep_0280.py @@ -25,13 +25,13 @@ from libervia.backend.core import exceptions from libervia.backend.core.constants import Const as C from twisted.words.protocols.jabber.error import StanzaError from twisted.internet import defer -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer try: from twisted.words.protocols.xmlstream import XMPPHandler except ImportError: - from wokkel.subprotocols import XMPPHandler + from tx_xmpp.subprotocols import XMPPHandler PARAM_CATEGORY = "Misc" @@ -172,7 +172,7 @@ class XEP_0280(object): return True -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0280_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0292.py b/libervia/backend/plugins/plugin_xep_0292.py index 9aaa8c28..b6249093 100644 --- a/libervia/backend/plugins/plugin_xep_0292.py +++ b/libervia/backend/plugins/plugin_xep_0292.py @@ -23,7 +23,7 @@ from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.protocols.jabber import jid from twisted.words.xish import domish from zope.interface import implementer -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from libervia.backend.core.constants import Const as C from libervia.backend.core.i18n import _ @@ -229,7 +229,7 @@ class XEP_0292: await self.update_v_card(client, {field: value}, entity) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0292_Handler(XMPPHandler): def getDiscoInfo(self, requestor, service, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0293.py b/libervia/backend/plugins/plugin_xep_0293.py index df2c51a9..9074cdc5 100644 --- a/libervia/backend/plugins/plugin_xep_0293.py +++ b/libervia/backend/plugins/plugin_xep_0293.py @@ -20,7 +20,7 @@ from typing import List from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core.constants import Const as C @@ -303,7 +303,7 @@ class XEP_0293: self.build_rtcp_fb_elements(desc_elt, media_data) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0293_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): return [disco.DiscoFeature(NS_JINGLE_RTP_RTCP_FB)] diff --git a/libervia/backend/plugins/plugin_xep_0294.py b/libervia/backend/plugins/plugin_xep_0294.py index e4ab74ab..024cc331 100644 --- a/libervia/backend/plugins/plugin_xep_0294.py +++ b/libervia/backend/plugins/plugin_xep_0294.py @@ -20,7 +20,7 @@ from typing import Dict, List, Optional, Union from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -244,7 +244,7 @@ class XEP_0294: desc_elt.addElement((NS_JINGLE_RTP_HDREXT, "extmap-allow-mixed")) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0294_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): return [disco.DiscoFeature(NS_JINGLE_RTP_HDREXT)] diff --git a/libervia/backend/plugins/plugin_xep_0297.py b/libervia/backend/plugins/plugin_xep_0297.py index 678307e7..8b272c98 100644 --- a/libervia/backend/plugins/plugin_xep_0297.py +++ b/libervia/backend/plugins/plugin_xep_0297.py @@ -26,7 +26,7 @@ from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend import G @@ -186,7 +186,7 @@ class XEP_0297: ) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0297_handler(XMPPHandler): def __init__(self, plugin_parent, profile): diff --git a/libervia/backend/plugins/plugin_xep_0298.py b/libervia/backend/plugins/plugin_xep_0298.py index 02f7a867..8b7dfa42 100644 --- a/libervia/backend/plugins/plugin_xep_0298.py +++ b/libervia/backend/plugins/plugin_xep_0298.py @@ -24,7 +24,7 @@ from libervia.backend.core.core_types import SatXMPPEntity from libervia.backend.core.i18n import _ from libervia.backend.core.constants import Const as C from libervia.backend.core.log import getLogger -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from twisted.words.protocols.jabber.xmlstream import XMPPHandler @@ -179,7 +179,7 @@ class XEP_0298: return {"info": {"users": users}} -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class CoinHandler(XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0300.py b/libervia/backend/plugins/plugin_xep_0300.py index 9de5b6c1..dcf361fe 100644 --- a/libervia/backend/plugins/plugin_xep_0300.py +++ b/libervia/backend/plugins/plugin_xep_0300.py @@ -28,7 +28,7 @@ from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -288,7 +288,7 @@ class XEP_0300: return best_algo, best_value -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0300_handler(XMPPHandler): def getDiscoInfo( diff --git a/libervia/backend/plugins/plugin_xep_0308.py b/libervia/backend/plugins/plugin_xep_0308.py index 1ba47687..d8a3453a 100644 --- a/libervia/backend/plugins/plugin_xep_0308.py +++ b/libervia/backend/plugins/plugin_xep_0308.py @@ -23,7 +23,7 @@ from twisted.internet import defer from twisted.words.protocols.jabber import xmlstream from twisted.words.protocols.jabber import jid from twisted.words.xish import domish -from wokkel import disco +from tx_xmpp import disco from zope.interface import implementer from libervia.backend.core import exceptions diff --git a/libervia/backend/plugins/plugin_xep_0313.py b/libervia/backend/plugins/plugin_xep_0313.py index ab5d02f1..d7327972 100644 --- a/libervia/backend/plugins/plugin_xep_0313.py +++ b/libervia/backend/plugins/plugin_xep_0313.py @@ -25,10 +25,10 @@ from dateutil import tz from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.error import StanzaError -from wokkel import disco -from wokkel import data_form -from wokkel import rsm -from wokkel import mam +from tx_xmpp import disco +from tx_xmpp import data_form +from tx_xmpp import rsm +from tx_xmpp import mam from zope.interface import implementer from libervia.backend.core import exceptions diff --git a/libervia/backend/plugins/plugin_xep_0320.py b/libervia/backend/plugins/plugin_xep_0320.py index 3dd55d24..e1e3c1d1 100644 --- a/libervia/backend/plugins/plugin_xep_0320.py +++ b/libervia/backend/plugins/plugin_xep_0320.py @@ -18,7 +18,7 @@ from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core.constants import Const as C @@ -95,7 +95,7 @@ class XEP_0320: return True -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0320_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): return [disco.DiscoFeature(NS_JINGLE_DTLS)] diff --git a/libervia/backend/plugins/plugin_xep_0329.py b/libervia/backend/plugins/plugin_xep_0329.py index dab04fab..a0852799 100644 --- a/libervia/backend/plugins/plugin_xep_0329.py +++ b/libervia/backend/plugins/plugin_xep_0329.py @@ -27,7 +27,7 @@ from twisted.words.protocols.jabber import xmlstream from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber import error as jabber_error from twisted.internet import defer -from wokkel import disco, iwokkel, data_form +from tx_xmpp import disco, itx_xmpp, data_form from libervia.backend import G from libervia.backend.core.i18n import _ from libervia.backend.core.xmpp import SatXMPPEntity @@ -1272,7 +1272,7 @@ class XEP_0329(object): self.host.bridge.fis_shared_path_removed(path, client.profile) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0329_handler(xmlstream.XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0334.py b/libervia/backend/plugins/plugin_xep_0334.py index 9b565b0d..c8b621d2 100644 --- a/libervia/backend/plugins/plugin_xep_0334.py +++ b/libervia/backend/plugins/plugin_xep_0334.py @@ -27,7 +27,7 @@ from libervia.backend.core.constants import Const as C from libervia.backend.tools.common import data_format -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from twisted.words.protocols.jabber import xmlstream from twisted.words.xish import domish @@ -133,7 +133,7 @@ class XEP_0334(object): return True -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0334_handler(xmlstream.XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0338.py b/libervia/backend/plugins/plugin_xep_0338.py index afa2da3f..817c061d 100644 --- a/libervia/backend/plugins/plugin_xep_0338.py +++ b/libervia/backend/plugins/plugin_xep_0338.py @@ -20,7 +20,7 @@ from typing import List from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core.constants import Const as C @@ -152,7 +152,7 @@ class XEP_0338: self.add_group_element(jingle_elt, session) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0338_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): return [disco.DiscoFeature(NS_RFC_5888)] diff --git a/libervia/backend/plugins/plugin_xep_0339.py b/libervia/backend/plugins/plugin_xep_0339.py index 6f7d4912..735095b4 100644 --- a/libervia/backend/plugins/plugin_xep_0339.py +++ b/libervia/backend/plugins/plugin_xep_0339.py @@ -20,7 +20,7 @@ from typing import List from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -187,7 +187,7 @@ class XEP_0339: return True -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0339_handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): return [disco.DiscoFeature(NS_JINGLE_RTP_SSMA)] diff --git a/libervia/backend/plugins/plugin_xep_0343.py b/libervia/backend/plugins/plugin_xep_0343.py index 94667146..4b404bcb 100644 --- a/libervia/backend/plugins/plugin_xep_0343.py +++ b/libervia/backend/plugins/plugin_xep_0343.py @@ -22,7 +22,7 @@ from twisted.internet import defer, reactor from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -334,7 +334,7 @@ class XEP_0343(BaseTransportHandler): return transport_elt -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP0343Handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): return [disco.DiscoFeature(NS_JINGLE_WEBRTC_DATACHANNELS)] diff --git a/libervia/backend/plugins/plugin_xep_0346.py b/libervia/backend/plugins/plugin_xep_0346.py index 34a56467..fa6174b0 100644 --- a/libervia/backend/plugins/plugin_xep_0346.py +++ b/libervia/backend/plugins/plugin_xep_0346.py @@ -24,9 +24,9 @@ from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish from twisted.internet import defer -from wokkel import disco, iwokkel -from wokkel import data_form -from wokkel import generic +from tx_xmpp import disco, itx_xmpp +from tx_xmpp import data_form +from tx_xmpp import generic from libervia.backend.core.i18n import _ from libervia.backend.core import exceptions from libervia.backend.core.constants import Const as C @@ -819,7 +819,7 @@ class PubsubSchema(object): return item_id -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class SchemaHandler(XMPPHandler): def getDiscoInfo(self, requestor, service, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0353.py b/libervia/backend/plugins/plugin_xep_0353.py index 849c7340..21ac82a8 100644 --- a/libervia/backend/plugins/plugin_xep_0353.py +++ b/libervia/backend/plugins/plugin_xep_0353.py @@ -23,7 +23,7 @@ from twisted.words.protocols.jabber import error, jid from twisted.words.protocols.jabber import xmlstream from twisted.words.xish import domish from libervia.backend.plugins.plugin_xep_0166.models import ApplicationData -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -480,7 +480,7 @@ class XEP_0353: return False -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class Handler(xmlstream.XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): return [disco.DiscoFeature(NS_JINGLE_MESSAGE)] diff --git a/libervia/backend/plugins/plugin_xep_0358.py b/libervia/backend/plugins/plugin_xep_0358.py index f0ee51a6..f11e1eea 100644 --- a/libervia/backend/plugins/plugin_xep_0358.py +++ b/libervia/backend/plugins/plugin_xep_0358.py @@ -22,7 +22,7 @@ from pydantic import BaseModel, Field from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -185,7 +185,7 @@ class XEP_0358: return JinglePubHandler(self) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class JinglePubHandler(XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0359.py b/libervia/backend/plugins/plugin_xep_0359.py index 58205983..6fe0cffb 100644 --- a/libervia/backend/plugins/plugin_xep_0359.py +++ b/libervia/backend/plugins/plugin_xep_0359.py @@ -22,7 +22,7 @@ import uuid from twisted.words.protocols.jabber import xmlstream from twisted.words.xish import domish -from wokkel import disco +from tx_xmpp import disco from zope.interface import implementer from libervia.backend.core import exceptions diff --git a/libervia/backend/plugins/plugin_xep_0363.py b/libervia/backend/plugins/plugin_xep_0363.py index 7ac0c5e3..ec07e4fb 100644 --- a/libervia/backend/plugins/plugin_xep_0363.py +++ b/libervia/backend/plugins/plugin_xep_0363.py @@ -29,7 +29,7 @@ from twisted.web import client as http_client from twisted.web import http_headers from twisted.words.protocols.jabber import error, jid, xmlstream from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -461,7 +461,7 @@ class XEP_0363: client.send(iq_result_elt) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0363_handler(xmlstream.XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0372.py b/libervia/backend/plugins/plugin_xep_0372.py index 35d25a0d..e46e6ca7 100644 --- a/libervia/backend/plugins/plugin_xep_0372.py +++ b/libervia/backend/plugins/plugin_xep_0372.py @@ -26,7 +26,7 @@ from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish from zope.interface import implementer -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from libervia.backend.core.constants import Const as C from libervia.backend.core.i18n import _ @@ -206,7 +206,7 @@ class XEP_0372: client.send(message_elt) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0372_Handler(XMPPHandler): def getDiscoInfo(self, requestor, service, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0373/__init__.py b/libervia/backend/plugins/plugin_xep_0373/__init__.py index 6d4e4f2f..421ea97c 100644 --- a/libervia/backend/plugins/plugin_xep_0373/__init__.py +++ b/libervia/backend/plugins/plugin_xep_0373/__init__.py @@ -42,8 +42,8 @@ from libervia.backend.tools.xmpp_datetime import format_datetime, parse_datetime from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.xish import domish -from wokkel import muc, pubsub -from wokkel.disco import DiscoFeature, DiscoInfo +from tx_xmpp import muc, pubsub +from tx_xmpp.disco import DiscoFeature, DiscoInfo import xmlschema from .exceptions import VerificationError, XMPPInteractionFailed diff --git a/libervia/backend/plugins/plugin_xep_0374.py b/libervia/backend/plugins/plugin_xep_0374.py index 9d576192..1fbbd30d 100644 --- a/libervia/backend/plugins/plugin_xep_0374.py +++ b/libervia/backend/plugins/plugin_xep_0374.py @@ -19,7 +19,7 @@ from typing import Dict, Optional, Set, cast from typing_extensions import Final -from wokkel import muc # type: ignore[import] +from tx_xmpp import muc # type: ignore[import] from libervia.backend.core import exceptions from libervia.backend.core.constants import Const as C diff --git a/libervia/backend/plugins/plugin_xep_0376.py b/libervia/backend/plugins/plugin_xep_0376.py index 2cb0c51f..513221fc 100644 --- a/libervia/backend/plugins/plugin_xep_0376.py +++ b/libervia/backend/plugins/plugin_xep_0376.py @@ -20,7 +20,7 @@ from typing import Dict, List, Tuple, Optional, Any from zope.interface import implementer from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler -from wokkel import disco, iwokkel, pubsub, data_form +from tx_xmpp import disco, itx_xmpp, pubsub, data_form from libervia.backend.core.i18n import _ from libervia.backend.core.constants import Const as C from libervia.backend.core import exceptions @@ -183,7 +183,7 @@ class XEP_0376: return False, subs -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0376_Handler(XMPPHandler): def getDiscoInfo(self, requestor, service, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0384.py b/libervia/backend/plugins/plugin_xep_0384.py index 6fa73910..374ad02d 100644 --- a/libervia/backend/plugins/plugin_xep_0384.py +++ b/libervia/backend/plugins/plugin_xep_0384.py @@ -40,7 +40,7 @@ import xml.etree.ElementTree as ET from xml.sax.saxutils import quoteattr from typing_extensions import Final, Never, assert_never -from wokkel import muc, pubsub # type: ignore[import] +from tx_xmpp import muc, pubsub # type: ignore[import] import xmlschema from libervia.backend.core import exceptions diff --git a/libervia/backend/plugins/plugin_xep_0391.py b/libervia/backend/plugins/plugin_xep_0391.py index 01fe2ad6..c9c9e13f 100644 --- a/libervia/backend/plugins/plugin_xep_0391.py +++ b/libervia/backend/plugins/plugin_xep_0391.py @@ -23,7 +23,7 @@ from typing import Any, Callable, Dict, List, Optional, Tuple, Union from twisted.words.protocols.jabber import error, jid, xmlstream from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from cryptography.exceptions import AlreadyFinalized from cryptography.hazmat import backends @@ -276,7 +276,7 @@ class JET: return True -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class JET_Handler(xmlstream.XMPPHandler): def getDiscoInfo(self, requestor, service, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0402.py b/libervia/backend/plugins/plugin_xep_0402.py index 271b721a..5caee86d 100644 --- a/libervia/backend/plugins/plugin_xep_0402.py +++ b/libervia/backend/plugins/plugin_xep_0402.py @@ -22,7 +22,7 @@ from pydantic import BaseModel, Field, RootModel from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.xish import domish -from wokkel import pubsub +from tx_xmpp import pubsub from libervia.backend.core import exceptions from libervia.backend.core.constants import Const as C diff --git a/libervia/backend/plugins/plugin_xep_0422.py b/libervia/backend/plugins/plugin_xep_0422.py index 4214c21d..7c631659 100644 --- a/libervia/backend/plugins/plugin_xep_0422.py +++ b/libervia/backend/plugins/plugin_xep_0422.py @@ -20,7 +20,7 @@ from collections import namedtuple from twisted.words.protocols.jabber import xmlstream from twisted.words.xish import domish -from wokkel import disco +from tx_xmpp import disco from zope.interface import implementer from libervia.backend.core.constants import Const as C diff --git a/libervia/backend/plugins/plugin_xep_0424.py b/libervia/backend/plugins/plugin_xep_0424.py index 7ef9ca96..a6de169d 100644 --- a/libervia/backend/plugins/plugin_xep_0424.py +++ b/libervia/backend/plugins/plugin_xep_0424.py @@ -22,7 +22,7 @@ from sqlalchemy.orm.attributes import flag_modified from twisted.internet import defer from twisted.words.protocols.jabber import jid, xmlstream from twisted.words.xish import domish -from wokkel import disco +from tx_xmpp import disco from zope.interface import implementer from libervia.backend.core import exceptions diff --git a/libervia/backend/plugins/plugin_xep_0428.py b/libervia/backend/plugins/plugin_xep_0428.py index 88f3f949..c73d1069 100644 --- a/libervia/backend/plugins/plugin_xep_0428.py +++ b/libervia/backend/plugins/plugin_xep_0428.py @@ -19,7 +19,7 @@ from typing import Optional from twisted.words.protocols.jabber import xmlstream from twisted.words.xish import domish -from wokkel import disco +from tx_xmpp import disco from zope.interface import implementer from libervia.backend.core.constants import Const as C diff --git a/libervia/backend/plugins/plugin_xep_0433.py b/libervia/backend/plugins/plugin_xep_0433.py index b20f4f6c..8b6fcc7b 100644 --- a/libervia/backend/plugins/plugin_xep_0433.py +++ b/libervia/backend/plugins/plugin_xep_0433.py @@ -22,7 +22,7 @@ from pydantic import BaseModel, Field, ConfigDict, RootModel, model_validator from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.xish import domish -from wokkel import data_form +from tx_xmpp import data_form from libervia.backend import G from libervia.backend.core import exceptions from libervia.backend.core.constants import Const as C diff --git a/libervia/backend/plugins/plugin_xep_0444.py b/libervia/backend/plugins/plugin_xep_0444.py index 964dda1f..835cd9d7 100644 --- a/libervia/backend/plugins/plugin_xep_0444.py +++ b/libervia/backend/plugins/plugin_xep_0444.py @@ -21,7 +21,7 @@ from typing import Iterable, List from twisted.internet import defer from twisted.words.protocols.jabber import jid, xmlstream from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer import emoji @@ -330,7 +330,7 @@ class XEP_0444: self.send_reactions(client, dest_jid, history.type, mess_id, reaction_replace_set) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0444_Handler(xmlstream.XMPPHandler): def getDiscoInfo(self, requestor, service, nodeIdentifier=""): return [disco.DiscoFeature(NS_REACTIONS)] diff --git a/libervia/backend/plugins/plugin_xep_0448.py b/libervia/backend/plugins/plugin_xep_0448.py index 0aa29ba4..1f78980b 100644 --- a/libervia/backend/plugins/plugin_xep_0448.py +++ b/libervia/backend/plugins/plugin_xep_0448.py @@ -32,7 +32,7 @@ from treq import collect from twisted.internet import defer from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend.core import exceptions @@ -494,7 +494,7 @@ class XEP_0448: return True -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP0448Handler(XMPPHandler): def getDiscoInfo(self, requestor, target, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0461.py b/libervia/backend/plugins/plugin_xep_0461.py index 3c954b00..0b00c014 100644 --- a/libervia/backend/plugins/plugin_xep_0461.py +++ b/libervia/backend/plugins/plugin_xep_0461.py @@ -22,7 +22,7 @@ from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from libervia.backend import G from libervia.backend.core import exceptions @@ -229,7 +229,7 @@ class XEP_0461: return True -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0461_handler(XMPPHandler): def getDiscoInfo( diff --git a/libervia/backend/plugins/plugin_xep_0465.py b/libervia/backend/plugins/plugin_xep_0465.py index b610a0d0..4a168d10 100644 --- a/libervia/backend/plugins/plugin_xep_0465.py +++ b/libervia/backend/plugins/plugin_xep_0465.py @@ -23,7 +23,7 @@ from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber import error from twisted.words.xish import domish from zope.interface import implementer -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from libervia.backend.core.constants import Const as C from libervia.backend.core.i18n import _ @@ -244,7 +244,7 @@ class XEP_0465: return options -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0465_Handler(XMPPHandler): def getDiscoInfo(self, requestor, service, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0470.py b/libervia/backend/plugins/plugin_xep_0470.py index 096db1ae..bcaf4c23 100644 --- a/libervia/backend/plugins/plugin_xep_0470.py +++ b/libervia/backend/plugins/plugin_xep_0470.py @@ -22,7 +22,7 @@ from twisted.words.protocols.jabber import jid, xmlstream, error from twisted.words.xish import domish from twisted.internet import defer from zope.interface import implementer -from wokkel import pubsub, disco, iwokkel +from tx_xmpp import pubsub, disco, itx_xmpp from libervia.backend.core.constants import Const as C from libervia.backend.core.i18n import _ @@ -547,7 +547,7 @@ class PubsubAttachments: return None -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class PubsubAttachments_Handler(xmlstream.XMPPHandler): def getDiscoInfo(self, requestor, service, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0471.py b/libervia/backend/plugins/plugin_xep_0471.py index 91f9c129..b0d2dd73 100644 --- a/libervia/backend/plugins/plugin_xep_0471.py +++ b/libervia/backend/plugins/plugin_xep_0471.py @@ -38,10 +38,10 @@ from libervia.backend.tools.common import data_format from twisted.internet import defer from twisted.words.protocols.jabber import jid, error from twisted.words.xish import domish -from wokkel import disco, iwokkel +from tx_xmpp import disco, itx_xmpp from zope.interface import implementer from twisted.words.protocols.jabber.xmlstream import XMPPHandler -from wokkel import pubsub, data_form +from tx_xmpp import pubsub, data_form log = getLogger(__name__) @@ -1167,7 +1167,7 @@ class XEP_0471: extra["element"] = event_elt -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class EventsHandler(XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0473.py b/libervia/backend/plugins/plugin_xep_0473.py index cceb0344..4997cf54 100644 --- a/libervia/backend/plugins/plugin_xep_0473.py +++ b/libervia/backend/plugins/plugin_xep_0473.py @@ -27,8 +27,8 @@ import shortuuid from twisted.internet import defer from twisted.words.protocols.jabber import jid, xmlstream from twisted.words.xish import domish -from wokkel import disco, iwokkel -from wokkel import rsm, pubsub +from tx_xmpp import disco, itx_xmpp +from tx_xmpp import rsm, pubsub from zope.interface import implementer from libervia.backend.core import exceptions @@ -817,7 +817,7 @@ class XEP_0473: return False -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class PubsubEncryption_Handler(xmlstream.XMPPHandler): def getDiscoInfo(self, requestor, service, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0475.py b/libervia/backend/plugins/plugin_xep_0475.py index 6a79927d..de0b3f9c 100644 --- a/libervia/backend/plugins/plugin_xep_0475.py +++ b/libervia/backend/plugins/plugin_xep_0475.py @@ -25,8 +25,8 @@ import shortuuid from twisted.internet import defer from twisted.words.protocols.jabber import jid, xmlstream from twisted.words.xish import domish -from wokkel import disco, iwokkel -from wokkel import pubsub +from tx_xmpp import disco, itx_xmpp +from tx_xmpp import pubsub from zope.interface import implementer from libervia.backend.core import exceptions @@ -318,7 +318,7 @@ class XEP_0475: return True -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class PubsubSigning_Handler(xmlstream.XMPPHandler): def getDiscoInfo(self, requestor, service, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0477.py b/libervia/backend/plugins/plugin_xep_0477.py index fb092e47..117d856a 100644 --- a/libervia/backend/plugins/plugin_xep_0477.py +++ b/libervia/backend/plugins/plugin_xep_0477.py @@ -21,8 +21,8 @@ from typing import Any, Dict, List, Optional from twisted.internet import defer from twisted.words.protocols.jabber import jid, xmlstream from twisted.words.xish import domish -from wokkel import disco, iwokkel -from wokkel import rsm +from tx_xmpp import disco, itx_xmpp +from tx_xmpp import rsm from zope.interface import implementer from libervia.backend.core import exceptions @@ -163,7 +163,7 @@ class XEP_0477: return True -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class XEP_0477_Handler(xmlstream.XMPPHandler): def getDiscoInfo(self, requestor, service, nodeIdentifier=""): diff --git a/libervia/backend/plugins/plugin_xep_0498.py b/libervia/backend/plugins/plugin_xep_0498.py index 17ed55c8..6496c63b 100644 --- a/libervia/backend/plugins/plugin_xep_0498.py +++ b/libervia/backend/plugins/plugin_xep_0498.py @@ -22,7 +22,7 @@ from pydantic import BaseModel from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, iwokkel, pubsub +from tx_xmpp import disco, itx_xmpp, pubsub from zope.interface import implementer from libervia.backend.core.constants import Const as C @@ -107,7 +107,7 @@ class XEP_0498: return PubsubFileSharingHandler(self) -@implementer(iwokkel.IDisco) +@implementer(itx_xmpp.IDisco) class PubsubFileSharingHandler(XMPPHandler): def __init__(self, plugin_parent): diff --git a/libervia/backend/plugins/plugin_xep_0499.py b/libervia/backend/plugins/plugin_xep_0499.py index fd2c5aca..893c2db3 100644 --- a/libervia/backend/plugins/plugin_xep_0499.py +++ b/libervia/backend/plugins/plugin_xep_0499.py @@ -34,7 +34,7 @@ from twisted.words.protocols.jabber.jid import JID from twisted.words.protocols.jabber import xmlstream from twisted.words.protocols.jabber.xmlstream import XMPPHandler from twisted.words.xish import domish -from wokkel import disco, data_form, pubsub +from tx_xmpp import disco, data_form, pubsub from zope.interface import implementer from libervia.backend.core import exceptions diff --git a/libervia/backend/test/helpers.py b/libervia/backend/test/helpers.py index 3c9b8418..e9cf0292 100644 --- a/libervia/backend/test/helpers.py +++ b/libervia/backend/test/helpers.py @@ -31,8 +31,8 @@ getLogger().setLevel(logging.WARNING) # put this to DEBUG when needed from libervia.backend.core import exceptions from libervia.backend.tools import config as tools_config from .constants import Const as C -from wokkel.xmppim import RosterItem -from wokkel.generic import parseXml +from tx_xmpp.xmppim import RosterItem +from tx_xmpp.generic import parseXml from libervia.backend.core.xmpp import LiberviaRosterProtocol from libervia.backend.memory.memory import Params, Memory from twisted.trial.unittest import FailTest diff --git a/libervia/backend/test/helpers_plugins.py b/libervia/backend/test/helpers_plugins.py index e48c91a2..d26f9d46 100644 --- a/libervia/backend/test/helpers_plugins.py +++ b/libervia/backend/test/helpers_plugins.py @@ -22,11 +22,11 @@ from twisted.internet import defer -from wokkel.muc import Room, User -from wokkel.generic import parseXml -from wokkel.disco import DiscoItem, DiscoItems +from tx_xmpp.muc import Room, User +from tx_xmpp.generic import parseXml +from tx_xmpp.disco import DiscoItem, DiscoItems -from wokkel.rsm import RSMResponse +from tx_xmpp.rsm import RSMResponse from .constants import Const as C from libervia.backend.plugins import plugin_xep_0045 @@ -45,7 +45,7 @@ class FakeMUCClient(object): @param nick: nick to be used in the room @param options: joining options @param profile_key: the profile key of the user joining the room - @return: the deferred joined wokkel.muc.Room instance + @return: the deferred joined tx_xmpp.muc.Room instance """ profile = self.host.memory.get_profile_name(profile_key) roster = {} @@ -131,7 +131,7 @@ class FakeXEP_0045(plugin_xep_0045.XEP_0045): @param nick: nick to be used in the room @param options: ignore @param profile_key: the profile of the user joining the room - @return: the deferred joined wokkel.muc.Room instance or None + @return: the deferred joined tx_xmpp.muc.Room instance or None """ profile = self.host.memory.get_profile_name(profile_key) if room_jid in self.clients[profile].joined_rooms: @@ -170,7 +170,7 @@ class FakeXEP_0045(plugin_xep_0045.XEP_0045): def get_room(self, muc_index, user_index): """Called by tests - @return: a wokkel.muc.Room instance""" + @return: a tx_xmpp.muc.Room instance""" profile = C.PROFILE[user_index] muc_jid = C.MUC[muc_index] try: diff --git a/libervia/backend/test/test_core_xmpp.py b/libervia/backend/test/test_core_xmpp.py index ff315a9f..8a2b179a 100644 --- a/libervia/backend/test/test_core_xmpp.py +++ b/libervia/backend/test/test_core_xmpp.py @@ -22,8 +22,8 @@ from .constants import Const from twisted.trial import unittest from libervia.backend.core import xmpp from twisted.words.protocols.jabber.jid import JID -from wokkel.generic import parseXml -from wokkel.xmppim import RosterItem +from tx_xmpp.generic import parseXml +from tx_xmpp.xmppim import RosterItem class SatXMPPClientTest(unittest.TestCase): diff --git a/libervia/backend/test/test_plugin_misc_radiocol.py b/libervia/backend/test/test_plugin_misc_radiocol.py index f24a7f97..d4bd5c73 100644 --- a/libervia/backend/test/test_plugin_misc_radiocol.py +++ b/libervia/backend/test/test_plugin_misc_radiocol.py @@ -356,7 +356,7 @@ class RadiocolTest(helpers.SatTestCase): def _join_room(self, room, nicks, player_index, sync=True): """Make a player join a room and update the list of nicks - @param room: wokkel.muc.Room instance from the referee perspective + @param room: tx_xmpp.muc.Room instance from the referee perspective @param nicks: list of the players which will be updated @param player_index: profile index of the new player @param sync: set to True to synchronize data @@ -395,7 +395,7 @@ class RadiocolTest(helpers.SatTestCase): def _leave_room(self, room, nicks, player_index): """Make a player leave a room and update the list of nicks - @param room: wokkel.muc.Room instance from the referee perspective + @param room: tx_xmpp.muc.Room instance from the referee perspective @param nicks: list of the players which will be updated @param player_index: profile index of the new player """ diff --git a/libervia/backend/test/test_plugin_misc_room_game.py b/libervia/backend/test/test_plugin_misc_room_game.py index 2b43f6aa..8ca815ac 100644 --- a/libervia/backend/test/test_plugin_misc_room_game.py +++ b/libervia/backend/test/test_plugin_misc_room_game.py @@ -25,7 +25,7 @@ from .constants import Const from libervia.backend.test import helpers, helpers_plugins from libervia.backend.plugins import plugin_misc_room_game as plugin from twisted.words.protocols.jabber.jid import JID -from wokkel.muc import User +from tx_xmpp.muc import User from logging import WARNING diff --git a/libervia/backend/test/test_plugin_xep_0085.py b/libervia/backend/test/test_plugin_xep_0085.py index f87ccb19..95dba2fc 100644 --- a/libervia/backend/test/test_plugin_xep_0085.py +++ b/libervia/backend/test/test_plugin_xep_0085.py @@ -26,7 +26,7 @@ from libervia.backend.core.constants import Const as C from libervia.backend.plugins import plugin_xep_0085 as plugin from copy import deepcopy from twisted.internet import defer -from wokkel.generic import parseXml +from tx_xmpp.generic import parseXml class XEP_0085Test(helpers.SatTestCase): diff --git a/libervia/backend/test/test_plugin_xep_0277.py b/libervia/backend/test/test_plugin_xep_0277.py index 2f2abb9c..88721673 100644 --- a/libervia/backend/test/test_plugin_xep_0277.py +++ b/libervia/backend/test/test_plugin_xep_0277.py @@ -24,7 +24,7 @@ from libervia.backend.plugins import plugin_xep_0277 from libervia.backend.plugins import plugin_xep_0060 from libervia.backend.plugins import plugin_misc_text_syntaxes from libervia.backend.tools.xml_tools import ElementParser -from wokkel.pubsub import NS_PUBSUB +from tx_xmpp.pubsub import NS_PUBSUB import importlib diff --git a/libervia/backend/test/test_plugin_xep_0297.py b/libervia/backend/test/test_plugin_xep_0297.py index 53d3d974..91971946 100644 --- a/libervia/backend/test/test_plugin_xep_0297.py +++ b/libervia/backend/test/test_plugin_xep_0297.py @@ -27,7 +27,7 @@ from libervia.backend.plugins.plugin_xep_0297 import XEP_0297 from twisted.words.protocols.jabber.jid import JID from dateutil.tz import tzutc import datetime -from wokkel.generic import parseXml +from tx_xmpp.generic import parseXml NS_PUBSUB = "http://jabber.org/protocol/pubsub" diff --git a/libervia/backend/test/test_plugin_xep_0313.py b/libervia/backend/test/test_plugin_xep_0313.py index 8a770634..19ec6557 100644 --- a/libervia/backend/test/test_plugin_xep_0313.py +++ b/libervia/backend/test/test_plugin_xep_0313.py @@ -25,12 +25,12 @@ from libervia.backend.test import helpers from libervia.backend.plugins.plugin_xep_0313 import XEP_0313 from twisted.words.protocols.jabber.jid import JID from twisted.words.xish import domish -from wokkel.data_form import Field +from tx_xmpp.data_form import Field from dateutil.tz import tzutc import datetime -from wokkel.rsm import RSMRequest -from wokkel.mam import buildForm, MAMRequest +from tx_xmpp.rsm import RSMRequest +from tx_xmpp.mam import buildForm, MAMRequest NS_PUBSUB = "http://jabber.org/protocol/pubsub" SERVICE = "sat-pubsub.tazar.int" diff --git a/libervia/backend/test/test_plugin_xep_0334.py b/libervia/backend/test/test_plugin_xep_0334.py index 3205019b..6d325c69 100644 --- a/libervia/backend/test/test_plugin_xep_0334.py +++ b/libervia/backend/test/test_plugin_xep_0334.py @@ -24,7 +24,7 @@ from .constants import Const as C from libervia.backend.test import helpers from libervia.backend.plugins.plugin_xep_0334 import XEP_0334 from twisted.internet import defer -from wokkel.generic import parseXml +from tx_xmpp.generic import parseXml from libervia.backend.core import exceptions HINTS = ("no-permanent-storage", "no-storage", "no-copy") diff --git a/libervia/backend/tools/utils.py b/libervia/backend/tools/utils.py index 71b14e59..f08bf958 100644 --- a/libervia/backend/tools/utils.py +++ b/libervia/backend/tools/utils.py @@ -153,7 +153,7 @@ def as_future(d): def ensure_deferred(func): """Decorator to apply ensureDeferred to a function - to be used when the function is called by third party library (e.g. wokkel) + to be used when the function is called by third party library (e.g. tx_xmpp) Otherwise, it's better to use ensureDeferred as early as possible. """ diff --git a/libervia/backend/tools/xml_tools.py b/libervia/backend/tools/xml_tools.py index 1377b304..ea6f3a59 100644 --- a/libervia/backend/tools/xml_tools.py +++ b/libervia/backend/tools/xml_tools.py @@ -28,7 +28,7 @@ from lxml import etree from twisted.internet import defer from twisted.words.protocols.jabber import jid from twisted.words.xish import domish -from wokkel import data_form +from tx_xmpp import data_form from libervia.backend.core import exceptions from libervia.backend.core.constants import Const as C @@ -481,7 +481,7 @@ def xmlui_result_to_elt(xmlui_data: dict, namespace: str | None = None): def tuple_list_2_data_form(values): - """Convert a list of tuples (name, value) to a wokkel submit data form. + """Convert a list of tuples (name, value) to a tx_xmpp submit data form. @param values (list): list of tuples @return: data_form.Form diff --git a/pyproject.toml b/pyproject.toml index 3acfd275..e56100f6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,7 +63,7 @@ dependencies = [ "urwid >= 1.2.0, < 3", "urwid-satext", "xmlschema < 4.3.1", - "tx-xmpp", + "tx-xmpp>=0.10", ] keywords = [ "XMPP", diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index 9dc59f19..9c14e6e5 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -22,7 +22,7 @@ from pytest import fixture from twisted.internet import defer from twisted.words.protocols.jabber import jid from libervia.backend import G -from wokkel.data_form import NS_X_DATA +from tx_xmpp.data_form import NS_X_DATA from libervia.backend.core.main import LiberviaBackend from libervia.backend.models.tor import TorMode from libervia.backend.tools import async_trigger as trigger diff --git a/tests/unit/test_ap-gateway.py b/tests/unit/test_ap-gateway.py index a0135391..aa16857b 100644 --- a/tests/unit/test_ap-gateway.py +++ b/tests/unit/test_ap-gateway.py @@ -32,7 +32,7 @@ from twisted.web.server import Request from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.error import StanzaError from twisted.words.xish import domish -from wokkel import pubsub, rsm +from tx_xmpp import pubsub, rsm from libervia.backend.core import exceptions from libervia.backend.core.constants import Const as C diff --git a/tests/unit/test_email_gateway.py b/tests/unit/test_email_gateway.py index 482d2b94..fdd22bdc 100644 --- a/tests/unit/test_email_gateway.py +++ b/tests/unit/test_email_gateway.py @@ -24,7 +24,7 @@ from unittest.mock import AsyncMock, MagicMock import pytest from pytest_twisted import ensureDeferred as ed from twisted.words.protocols.jabber import jid -from wokkel import disco +from tx_xmpp import disco from libervia.backend.plugins.plugin_comp_email_gateway import ( EmailGatewayComponent, diff --git a/tests/unit/test_plugin_misc_pubsub_contacts.py b/tests/unit/test_plugin_misc_pubsub_contacts.py index 95f5d5c8..da00ba34 100644 --- a/tests/unit/test_plugin_misc_pubsub_contacts.py +++ b/tests/unit/test_plugin_misc_pubsub_contacts.py @@ -17,7 +17,7 @@ # along with this program. If not, see . from twisted.words.xish import domish -from wokkel.pubsub import NS_PUBSUB +from tx_xmpp.pubsub import NS_PUBSUB from libervia.backend.plugins.plugin_misc_pubsub_contacts import ( Contact, diff --git a/uv.lock b/uv.lock index ab7bd0a8..4cd7cbd0 100644 --- a/uv.lock +++ b/uv.lock @@ -874,7 +874,7 @@ requires-dist = [ { name = "treq", specifier = "~=24.9.0" }, { name = "twisted", extras = ["tls"], specifier = ">=22.10,<24.11.0" }, { name = "twomemo", specifier = ">=1.0.0,<2" }, - { name = "tx-xmpp" }, + { name = "tx-xmpp", specifier = ">=0.10" }, { name = "txdbus" }, { name = "txtorcon", marker = "extra == 'all'", specifier = "~=24.8.0" }, { name = "txtorcon", marker = "extra == 'main'", specifier = "~=24.8.0" }, @@ -2201,16 +2201,16 @@ wheels = [ [[package]] name = "tx-xmpp" -version = "0.9.0" +version = "0.10.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "constantly" }, { name = "python-dateutil" }, { name = "twisted", extra = ["tls"] }, ] -sdist = { url = "https://files.pythonhosted.org/packages/4a/5e/923833a014e67330d10d63de131110e86d47f769c54db75e82492a90c71a/tx_xmpp-0.9.0.tar.gz", hash = "sha256:e6240127770a029eb4ac0916eb66806b1fab85245b937696ac1541ae922e44a5", size = 126919, upload-time = "2026-03-21T22:11:22.004Z" } +sdist = { url = "https://files.pythonhosted.org/packages/5d/6f/9c1638b017424a028ccd0474a2f7f01db20f3a3fd32f5a6141b74b32fd78/tx_xmpp-0.10.1.tar.gz", hash = "sha256:6742c54e42b31a95f9d0a9cceb768c7d319262e0eb2febe9e02a86638e63dcf3", size = 125544, upload-time = "2026-03-24T11:46:08.644Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/89/78/5061d9bd94980b4d10855a6f7e503551901f0f84d597d839983cb6625bd1/tx_xmpp-0.9.0-py3-none-any.whl", hash = "sha256:076cfa24ca0d3f4c47f707eafa2d44472a7236e87b2e5ef71c1817d3bc408cb8", size = 140750, upload-time = "2026-03-21T22:11:23.826Z" }, + { url = "https://files.pythonhosted.org/packages/52/ad/58556d0a4e3d7351fdc88408fe631d037d289c17901ec7a9e27b2a3a94e6/tx_xmpp-0.10.1-py3-none-any.whl", hash = "sha256:42773cf36fc5ff75499127d9bca7d8fa8c0f5ae8cc4598fc5ad295f4030885e8", size = 140694, upload-time = "2026-03-24T11:46:06.766Z" }, ] [[package]]