diff --git a/zulip_bots/zulip_bots/finder.py b/zulip_bots/zulip_bots/finder.py index 8fbcc495c..fb5c80f6e 100644 --- a/zulip_bots/zulip_bots/finder.py +++ b/zulip_bots/zulip_bots/finder.py @@ -2,13 +2,17 @@ import importlib.abc import importlib.util import os +import sys from pathlib import Path from types import ModuleType from typing import Any, Optional, Tuple current_dir = os.path.dirname(os.path.abspath(__file__)) -import importlib_metadata as metadata +if sys.version_info >= (3, 10): + from importlib.metadata import metadata # Python 3.10+ standard library +else: + from importlib_metadata import metadata # External package for Python < 3.10 def import_module_from_source(path: str, name: str) -> Any: diff --git a/zulip_bots/zulip_bots/tests/test_finder.py b/zulip_bots/zulip_bots/tests/test_finder.py index 6d4551bf3..7519c3154 100644 --- a/zulip_bots/zulip_bots/tests/test_finder.py +++ b/zulip_bots/zulip_bots/tests/test_finder.py @@ -1,6 +1,7 @@ +import pytest from pathlib import Path from unittest import TestCase - +from unittest.mock import patch from zulip_bots import finder @@ -11,4 +12,4 @@ def test_resolve_bot_path(self) -> None: expected_bot_name = "helloworld" expected_bot_path_and_name = (expected_bot_path, expected_bot_name) actual_bot_path_and_name = finder.resolve_bot_path("helloworld") - self.assertEqual(expected_bot_path_and_name, actual_bot_path_and_name) + self.assertEqual(expected_bot_path_and_name, actual_bot_path_and_name) \ No newline at end of file