imports fix

Author: walnutflat

tests/conftest.py

@@ -13,7 +13,7 @@
 from yatq.dto import TaskState
 from yatq.queue import Queue
 
-if not AIOREDIS_USE or aioredis.__version__ >= "2.0":  # pragma: no cover
+if not AIOREDIS_USE or aioredis.__version__ >= "2.0":
 
     async def create_redis_connection(redis_uri: str):
         return aioredis.from_url(redis_uri)

yatq/function.py

@@ -4,10 +4,12 @@
 from string import Template
 from typing import Any, Dict
 
-try:
+from yatq.py_version import AIOREDIS_USE
+
+if AIOREDIS_USE:
     from aioredis import Redis
-except ImportError:
-    from redis.asyncio import Redis  # type: ignore
+else:
+    from redis.asyncio import Redis  # type: ignore # pragma: no cover
 
 from yatq.redis_compat import NoScriptError, eval_sha  # type: ignore
 

yatq/queue.py

@@ -7,9 +7,11 @@
 from typing import Any, Dict, Optional, Union
 from uuid import uuid4
 
-try:
-    from aioredis import Redis  # pragma: no cover
-except ImportError:
+from yatq.py_version import AIOREDIS_USE
+
+if AIOREDIS_USE:
+    from aioredis import Redis
+else:
     from redis.asyncio import Redis  # type: ignore # pragma: no cover
 
 from .defaults import (

yatq/redis_compat.py

@@ -2,7 +2,7 @@
 from typing import Any, Tuple
 from yatq.py_version import AIOREDIS_USE
 
-if AIOREDIS_USE:  # pragma: no cover
+if AIOREDIS_USE:
     import aioredis
 
     if aioredis.__version__ >= "2.0":
@@ -13,7 +13,7 @@ async def eval_sha(
         ):  # pragma: no cover
             return await client.evalsha(digest, 0, *args)
 
-    else:
+    else:  # pragma: no cover
         from aioredis.errors import ReplyError
 
         class NoScriptError(ReplyError):
@@ -36,5 +36,4 @@ async def eval_sha(
     async def eval_sha(
         client: aioredis.Redis, digest: str, args: Tuple[Any]
     ):  # pragma: no cover
-        # return await client.evalsha(digest, 0, *args)
         return await client.execute_command("EVALSHA", digest, 0, *args)

yatq/worker/runner.py

@@ -4,11 +4,14 @@
 import traceback
 from typing import Dict, List, Optional, Set, Type, cast
 
-try:
+from yatq.py_version import AIOREDIS_USE
+
+if AIOREDIS_USE:
     import aioredis
-except ImportError:
+else:  # pragma: no cover
     from redis import asyncio as aioredis  # type: ignore
 
+
 from yatq.defaults import DEFAULT_MAX_JOBS, DEFAULT_QUEUE_NAMESPACE
 from yatq.dto import TaskWrapper
 from yatq.enums import TaskState

yatq/worker/worker_settings.py

@@ -2,9 +2,11 @@
 from typing import Awaitable, Callable, Dict, Optional, Tuple, Type
 from abc import ABC, abstractmethod
 
-try:
+from yatq.py_version import AIOREDIS_USE
+
+if AIOREDIS_USE:
     import aioredis
-except ImportError:
+else:  # pragma: no cover
     from redis import asyncio as aioredis  # type: ignore
 
 from yatq.worker.factory.base import BaseJobFactory