fix conflict

src/plugins/nonebot_bison/config_manager.py

@@ -294,12 +294,14 @@ del_sub_matcher = on_command(
 del_sub_matcher.handle()(set_target_user_info)
 do_del_sub(del_sub_matcher)
 
-group_manage_matcher = on_command("群管理",rule=to_me(),permission=SUPERUSER,priority=4)
+group_manage_matcher = on_command("群管理", rule=to_me(), permission=SUPERUSER, priority=4)
+
 
 @group_manage_matcher.handle()
 async def send_group_list(bot: Bot, event: GroupMessageEvent, state: T_State):
     await group_manage_matcher.finish(Message("该功能只支持私聊使用，请私聊Bot"))
 
+
 @group_manage_matcher.handle()
 async def send_group_list(bot: Bot, event: PrivateMessageEvent, state: T_State):
     groups = await bot.call_api("get_group_list")

tests/test_config_manager_admin.py

@@ -1,11 +1,13 @@
-
+import pytest
 from nonebug import App
 
-from .utils import fake_admin_user, fake_private_message_event, fake_group_message_event, fake_superuser
+from .utils import (
+    fake_admin_user,
+    fake_group_message_event,
+    fake_private_message_event,
+    fake_superuser,
+)
 
-from .conftest import app
-
-import pytest
 
 @pytest.mark.asyncio
 async def test_query_with_superuser_private(app: App):
@@ -51,6 +53,7 @@ async def test_query_with_superuser_private(app: App):
         ctx.should_pass_rule()
         ctx.should_pass_permission()
 
+
 @pytest.mark.asyncio
 async def test_query_with_superuser_group_tome(app: App):
     from nonebot.adapters.onebot.v11.bot import Bot
@@ -67,4 +70,4 @@ async def test_query_with_superuser_group_tome(app: App):
         ctx.should_pass_permission()
         ctx.should_call_send(
             event, Message("该功能只支持私聊使用，请私聊Bot"), True
-        )
+        )