chore: rename logging.py and redis.py to avoid circular imports

Signed-off-by: Leonidas Spyropoulos <artafinde@archlinux.org>

test/conftest.py

@@ -52,12 +52,12 @@ from sqlalchemy.orm import scoped_session
 
 import aurweb.config
 import aurweb.db
-from aurweb import initdb, logging, testing
+from aurweb import aur_logging, initdb, testing
 from aurweb.testing.email import Email
 from aurweb.testing.filelock import FileLock
 from aurweb.testing.git import GitRepository
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 # Synchronization lock for database setup.
 setup_lock = Lock()

test/test_accounts_routes.py

@@ -11,7 +11,7 @@ from fastapi.testclient import TestClient
 
 import aurweb.config
 import aurweb.models.account_type as at
-from aurweb import captcha, db, logging, time
+from aurweb import aur_logging, captcha, db, time
 from aurweb.asgi import app
 from aurweb.db import create, query
 from aurweb.models.accepted_term import AcceptedTerm
@@ -31,7 +31,7 @@ from aurweb.models.user import User
 from aurweb.testing.html import get_errors
 from aurweb.testing.requests import Request
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 # Some test global constants.
 TEST_USERNAME = "test"

test/test_asgi.py

@@ -10,17 +10,17 @@ from fastapi import HTTPException
 from fastapi.testclient import TestClient
 
 import aurweb.asgi
+import aurweb.aur_redis
 import aurweb.config
-import aurweb.redis
 from aurweb.exceptions import handle_form_exceptions
 from aurweb.testing.requests import Request
 
 
 @pytest.fixture
 def setup(db_test, email_test):
-    aurweb.redis.redis_connection().flushall()
+    aurweb.aur_redis.redis_connection().flushall()
     yield
-    aurweb.redis.redis_connection().flushall()
+    aurweb.aur_redis.redis_connection().flushall()
 
 
 @pytest.fixture

test/test_homepage.py

@@ -7,6 +7,7 @@ from fastapi.testclient import TestClient
 
 from aurweb import db, time
 from aurweb.asgi import app
+from aurweb.aur_redis import redis_connection
 from aurweb.models.account_type import USER_ID
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
@@ -14,7 +15,6 @@ from aurweb.models.package_comaintainer import PackageComaintainer
 from aurweb.models.package_request import PackageRequest
 from aurweb.models.request_type import DELETION_ID, RequestType
 from aurweb.models.user import User
-from aurweb.redis import redis_connection
 from aurweb.testing.html import parse_root
 from aurweb.testing.requests import Request
 

test/test_logging.py

@@ -1,6 +1,6 @@
-from aurweb import logging
+from aurweb import aur_logging
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 
 def test_logging(caplog):

test/test_packages_util.py

@@ -2,6 +2,7 @@ import pytest
 from fastapi.testclient import TestClient
 
 from aurweb import asgi, config, db, time
+from aurweb.aur_redis import kill_redis
 from aurweb.models.account_type import USER_ID
 from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
 from aurweb.models.package import Package
@@ -11,7 +12,6 @@ from aurweb.models.package_source import PackageSource
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.user import User
 from aurweb.packages import util
-from aurweb.redis import kill_redis
 
 
 @pytest.fixture(autouse=True)

test/test_ratelimit.py

@@ -3,13 +3,13 @@ from unittest import mock
 import pytest
 from redis.client import Pipeline
 
-from aurweb import config, db, logging
+from aurweb import aur_logging, config, db
+from aurweb.aur_redis import redis_connection
 from aurweb.models import ApiRateLimit
 from aurweb.ratelimit import check_ratelimit
-from aurweb.redis import redis_connection
 from aurweb.testing.requests import Request
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 
 @pytest.fixture(autouse=True)

test/test_redis.py

@@ -3,11 +3,11 @@ from unittest import mock
 import pytest
 
 import aurweb.config
-from aurweb.redis import redis_connection
+from aurweb.aur_redis import redis_connection
 
 
 @pytest.fixture
-def rediss():
+def redis():
     """Create a RedisStub."""
 
     def mock_get(section, key):
@@ -21,20 +21,20 @@ def rediss():
     yield redis
 
 
-def test_redis_stub(rediss):
+def test_redis_stub(redis):
     # We don't yet have a test key set.
-    assert rediss.get("test") is None
+    assert redis.get("test") is None
 
     # Set the test key to abc.
-    rediss.set("test", "abc")
-    assert rediss.get("test").decode() == "abc"
+    redis.set("test", "abc")
+    assert redis.get("test").decode() == "abc"
 
     # Test expire.
-    rediss.expire("test", 0)
-    assert rediss.get("test") is None
+    redis.expire("test", 0)
+    assert redis.get("test") is None
 
     # Now, set the test key again and use delete() on it.
-    rediss.set("test", "abc")
-    assert rediss.get("test").decode() == "abc"
-    rediss.delete("test")
-    assert rediss.get("test") is None
+    redis.set("test", "abc")
+    assert redis.get("test").decode() == "abc"
+    redis.delete("test")
+    assert redis.get("test") is None

test/test_rendercomment.py

@@ -2,14 +2,14 @@ from unittest import mock
 
 import pytest
 
-from aurweb import config, db, logging, time
+from aurweb import aur_logging, config, db, time
 from aurweb.models import Package, PackageBase, PackageComment, User
 from aurweb.models.account_type import USER_ID
 from aurweb.scripts import rendercomment
 from aurweb.scripts.rendercomment import update_comment_render
 from aurweb.testing.git import GitRepository
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 aur_location = config.get("options", "aur_location")
 
 

test/test_rpc.py

@@ -10,6 +10,7 @@ from redis.client import Pipeline
 import aurweb.models.dependency_type as dt
 import aurweb.models.relation_type as rt
 from aurweb import asgi, config, db, rpc, scripts, time
+from aurweb.aur_redis import redis_connection
 from aurweb.models.account_type import USER_ID
 from aurweb.models.dependency_type import DEPENDS_ID
 from aurweb.models.license import License
@@ -22,7 +23,6 @@ from aurweb.models.package_relation import PackageRelation
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import PROVIDES_ID
 from aurweb.models.user import User
-from aurweb.redis import redis_connection
 
 
 @pytest.fixture

test/test_rss.py

@@ -4,14 +4,14 @@ import lxml.etree
 import pytest
 from fastapi.testclient import TestClient
 
-from aurweb import db, logging, time
+from aurweb import aur_logging, db, time
 from aurweb.asgi import app
 from aurweb.models.account_type import AccountType
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
 from aurweb.models.user import User
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 
 @pytest.fixture(autouse=True)