diff --git a/libervia/backend/core/sat_main.py b/libervia/backend/core/main.py similarity index 100% rename from libervia/backend/core/sat_main.py rename to libervia/backend/core/main.py diff --git a/libervia/backend/plugins/plugin_xep_0082.py b/libervia/backend/plugins/plugin_xep_0082.py index 966fa5a5..39483fe3 100644 --- a/libervia/backend/plugins/plugin_xep_0082.py +++ b/libervia/backend/plugins/plugin_xep_0082.py @@ -19,7 +19,7 @@ from libervia.backend.core.constants import Const as C from libervia.backend.core.i18n import D_ -from libervia.backend.core.sat_main import LiberviaBackend +from libervia.backend.core.main import LiberviaBackend from libervia.backend.tools import xmpp_datetime diff --git a/libervia/backend/plugins/plugin_xep_0373.py b/libervia/backend/plugins/plugin_xep_0373.py index eadfa48c..2f219653 100644 --- a/libervia/backend/plugins/plugin_xep_0373.py +++ b/libervia/backend/plugins/plugin_xep_0373.py @@ -35,7 +35,7 @@ from libervia.backend.core.constants import Const as C from libervia.backend.core.core_types import SatXMPPEntity from libervia.backend.core.i18n import _, D_ from libervia.backend.core.log import getLogger, Logger -from libervia.backend.core.sat_main import LiberviaBackend +from libervia.backend.core.main import LiberviaBackend from libervia.backend.core.xmpp import SatXMPPClient from libervia.backend.memory import persistent from libervia.backend.plugins.plugin_xep_0045 import XEP_0045 diff --git a/libervia/backend/plugins/plugin_xep_0374.py b/libervia/backend/plugins/plugin_xep_0374.py index e9118eb0..881384d3 100644 --- a/libervia/backend/plugins/plugin_xep_0374.py +++ b/libervia/backend/plugins/plugin_xep_0374.py @@ -26,7 +26,7 @@ from libervia.backend.core.constants import Const as C from libervia.backend.core.core_types import SatXMPPEntity from libervia.backend.core.i18n import _, D_ from libervia.backend.core.log import getLogger, Logger -from libervia.backend.core.sat_main import LiberviaBackend +from libervia.backend.core.main import LiberviaBackend from libervia.backend.core.xmpp import SatXMPPClient from libervia.backend.plugins.plugin_xep_0045 import XEP_0045 from libervia.backend.plugins.plugin_xep_0334 import XEP_0334 diff --git a/libervia/backend/plugins/plugin_xep_0384.py b/libervia/backend/plugins/plugin_xep_0384.py index 42bdc05e..c9117504 100644 --- a/libervia/backend/plugins/plugin_xep_0384.py +++ b/libervia/backend/plugins/plugin_xep_0384.py @@ -36,7 +36,7 @@ from libervia.backend.core.constants import Const as C from libervia.backend.core.core_types import MessageData, SatXMPPEntity from libervia.backend.core.i18n import _, D_ from libervia.backend.core.log import getLogger, Logger -from libervia.backend.core.sat_main import LiberviaBackend +from libervia.backend.core.main import LiberviaBackend from libervia.backend.core.xmpp import SatXMPPClient from libervia.backend.memory import persistent from libervia.backend.plugins.plugin_misc_text_commands import TextCommands diff --git a/libervia/backend/plugins/plugin_xep_0420.py b/libervia/backend/plugins/plugin_xep_0420.py index dee36ccc..79264703 100644 --- a/libervia/backend/plugins/plugin_xep_0420.py +++ b/libervia/backend/plugins/plugin_xep_0420.py @@ -30,7 +30,7 @@ from libervia.backend.core import exceptions from libervia.backend.core.constants import Const as C from libervia.backend.core.i18n import D_ from libervia.backend.core.log import Logger, getLogger -from libervia.backend.core.sat_main import LiberviaBackend +from libervia.backend.core.main import LiberviaBackend from libervia.backend.tools.xml_tools import ElementParser from libervia.backend.plugins.plugin_xep_0033 import NS_ADDRESS from libervia.backend.plugins.plugin_xep_0082 import XEP_0082 diff --git a/libervia/backend/tools/stream.py b/libervia/backend/tools/stream.py index 1a405715..b7c15f56 100644 --- a/libervia/backend/tools/stream.py +++ b/libervia/backend/tools/stream.py @@ -31,7 +31,7 @@ from libervia.backend.core.log import getLogger from twisted.protocols import basic from twisted.internet import interfaces -from libervia.backend.core.sat_main import LiberviaBackend +from libervia.backend.core.main import LiberviaBackend log = getLogger(__name__) diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index 8f1cbb08..1d9ba6e0 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -21,7 +21,7 @@ from unittest.mock import MagicMock, AsyncMock from pytest import fixture from twisted.internet import defer from twisted.words.protocols.jabber import jid -from libervia.backend.core.sat_main import LiberviaBackend +from libervia.backend.core.main import LiberviaBackend from libervia.backend.tools import async_trigger as trigger from libervia.backend.core import xmpp diff --git a/twisted/plugins/sat_plugin.py b/twisted/plugins/sat_plugin.py index 00492ce0..b61b1372 100644 --- a/twisted/plugins/sat_plugin.py +++ b/twisted/plugins/sat_plugin.py @@ -69,7 +69,7 @@ class SatMaker: # XXX: Libervia must be imported after log configuration, # because it write stuff to logs initialise(options.parent) - from libervia.backend.core.sat_main import LiberviaBackend + from libervia.backend.core.main import LiberviaBackend return LiberviaBackend()