fix import, maintain backwards compat

OpenVoiceOS · Nov 20, 2024 · 6513cb5 · 6513cb5
1 parent f0dbd7a
commit 6513cb5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/ovos_bus_client/client/client.py b/ovos_bus_client/client/client.py
@@ -7,7 +7,11 @@
 from uuid import uuid4
 
 from ovos_utils.log import LOG, deprecated
-from pyee import ExecutorEventEmitter
+try:
+    from pyee import ExecutorEventEmitter
+except ImportError:
+    from pyee.executor import ExecutorEventEmitter
+
 from websocket import (WebSocketApp,
                        WebSocketConnectionClosedException,
                        WebSocketException)

diff --git a/test/unittests/test_client.py b/test/unittests/test_client.py
@@ -13,7 +13,10 @@
 import unittest
 from unittest.mock import call, Mock, patch
 
-from pyee import ExecutorEventEmitter
+try:
+    from pyee import ExecutorEventEmitter
+except ImportError:
+    from pyee.executor import ExecutorEventEmitter
 
 from ovos_bus_client.message import Message
 from ovos_bus_client.client.client import MessageBusClient, GUIWebsocketClient

diff --git a/test/unittests/test_event_scheduler.py b/test/unittests/test_event_scheduler.py
@@ -4,7 +4,11 @@
 
 import unittest
 import time
-from pyee import ExecutorEventEmitter
+try:
+    from pyee import ExecutorEventEmitter
+except ImportError:
+    from pyee.executor import ExecutorEventEmitter
+
 
 from unittest.mock import MagicMock, patch
 from ovos_utils.messagebus import FakeBus