From 1543ba21d2d65991c3162b139f32ab0f4621b749 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 8 Oct 2022 16:40:16 +0000 Subject: [PATCH] auto fix by pre-commit hooks --- src/plugins/nonebot_bison/admin_page/api.py | 2 +- src/plugins/nonebot_bison/config/db_config.py | 4 +++- tests/config/test_config_operation.py | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/plugins/nonebot_bison/admin_page/api.py b/src/plugins/nonebot_bison/admin_page/api.py index 06ec05e..4e926f4 100644 --- a/src/plugins/nonebot_bison/admin_page/api.py +++ b/src/plugins/nonebot_bison/admin_page/api.py @@ -7,10 +7,10 @@ from ..config import ( NoSuchUserException, config, ) +from ..config.db_config import SubscribeDupException from ..platform import check_sub_target, platform_manager from ..types import Target as T_Target from ..types import WeightConfig -from ..config.db_config import SubscribeDupException from .jwt import pack_jwt from .token_manager import token_manager diff --git a/src/plugins/nonebot_bison/config/db_config.py b/src/plugins/nonebot_bison/config/db_config.py index d7b3150..cc654d7 100644 --- a/src/plugins/nonebot_bison/config/db_config.py +++ b/src/plugins/nonebot_bison/config/db_config.py @@ -23,9 +23,11 @@ def _get_time(): cur_time = time(hour=dt.hour, minute=dt.minute, second=dt.second) return cur_time + class SubscribeDupException(Exception): ... + class DBConfig: def __init__(self): self.add_target_hook: Optional[Callable[[str, T_Target], Awaitable]] = None @@ -79,7 +81,7 @@ class DBConfig: try: await session.commit() except IntegrityError as e: - if len(e.args) > 0 and 'UNIQUE constraint failed' in e.args[0]: + if len(e.args) > 0 and "UNIQUE constraint failed" in e.args[0]: raise SubscribeDupException() raise e diff --git a/tests/config/test_config_operation.py b/tests/config/test_config_operation.py index 1e7cecd..a87ebfb 100644 --- a/tests/config/test_config_operation.py +++ b/tests/config/test_config_operation.py @@ -1,5 +1,5 @@ -from nonebug.app import App import pytest +from nonebug.app import App from sqlalchemy.ext.asyncio.session import AsyncSession from sqlalchemy.sql.functions import func from sqlmodel.sql.expression import select @@ -72,11 +72,11 @@ async def test_add_subscribe(app: App, init_scheduler): assert conf.categories == [1] assert conf.tags == ["tag"] + async def test_add_dup_sub(init_scheduler): - from nonebot_bison.config.db_config import config + from nonebot_bison.config.db_config import SubscribeDupException, config from nonebot_bison.types import Target as TTarget - from nonebot_bison.config.db_config import SubscribeDupException await config.add_subscribe( user=123, @@ -99,6 +99,7 @@ async def test_add_dup_sub(init_scheduler): tags=[], ) + async def test_del_subsribe(init_scheduler): from nonebot_bison.config.db_config import config from nonebot_bison.config.db_model import Subscribe, Target, User