Move bridge state to mautrix.util

mautrix · Jul 14, 2021 · e2ce035 · e2ce035
1 parent 656904f
commit e2ce035
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/mautrix/bridge/__init__.py b/mautrix/bridge/__init__.py
@@ -9,4 +9,4 @@
 from .bridge import Bridge
 from .notification_disabler import NotificationDisabler
 from .async_getter_lock import async_getter_lock
-from .state import BridgeState
+from mautrix.util.bridge_state import BridgeState
diff --git a/mautrix/bridge/e2ee.py b/mautrix/bridge/e2ee.py
@@ -31,7 +31,7 @@
     Database = None
 
 if TYPE_CHECKING:
-    from mautrix.bridge import Bridge
+    from mautrix.util.bridge_state import Bridge
 
 
 class EncryptionManager:

diff --git a/mautrix/bridge/user.py b/mautrix/bridge/user.py
@@ -15,10 +15,10 @@
 from mautrix.errors import MNotFound
 from mautrix.util.logging import TraceLogger
 from mautrix.util.opt_prometheus import Gauge
+from mautrix.util.bridge_state import BridgeState
 
 from .portal import BasePortal
 from .puppet import BasePuppet
-from .state import BridgeState
 
 if TYPE_CHECKING:
     from .bridge import Bridge

diff --git a/mautrix/util/__init__.py b/mautrix/util/__init__.py
@@ -1,3 +1,3 @@
 __all__ = ["formatter", "logging", "config", "signed_token", "simple_template", "manhole",
            "markdown", "simple_lock", "file_store", "program", "async_db", "db", "opt_prometheus",
-           "color_log", "magic"]
+           "color_log", "magic", "bridge_state"]
diff --git a/mautrix/bridge/state.py → mautrix/util/bridge_state.py b/mautrix/bridge/state.py → mautrix/util/bridge_state.py