From 41871ff56baa7fe5b2d196b3e496a5f749797f62 Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 05:11:15 +0800 Subject: [PATCH] refactor: group imports from same package (#38) Imports for the same package are scattered and not grouped together. It is recommended to keep the imports from the same package together. It makes the code easier to read. Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com> --- .../nonebot_plugin_setu_now/__init__.py | 22 +++++-------------- src/plugins/nonebot_plugin_status/__init__.py | 2 +- .../nonebot_plugin_wordcloud/__init__.py | 3 +-- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/plugins/nonebot_plugin_setu_now/__init__.py b/src/plugins/nonebot_plugin_setu_now/__init__.py index 43c7b42..3db0d14 100755 --- a/src/plugins/nonebot_plugin_setu_now/__init__.py +++ b/src/plugins/nonebot_plugin_setu_now/__init__.py @@ -1,5 +1,11 @@ from nonebot.adapters.onebot.v11.permission import GROUP_ADMIN from nonebot.permission import SUPERUSER +from nonebot import on_command, on_regex, require +from nonebot.adapters.onebot.v11 import GROUP, PRIVATE_FRIEND, Bot, Message, MessageEvent, MessageSegment, GroupMessageEvent, PrivateMessageEvent +from nonebot.exception import ActionFailed +from nonebot.log import logger +from nonebot.params import Depends, RegexGroup +from nonebot.plugin import PluginMetadata from .r18_whitelist import get_group_white_list_record from .data_source import SetuHandler from .perf_timer import PerfTimer @@ -20,27 +26,11 @@ autorevoke_send, ) from nonebot_plugin_tortoise_orm import add_model -from nonebot.adapters.onebot.v11 import ( - GROUP, - PRIVATE_FRIEND, - Bot, - Message, - MessageEvent, - MessageSegment, - GroupMessageEvent, - PrivateMessageEvent, -) -from nonebot.exception import ActionFailed -from nonebot.plugin import PluginMetadata -from nonebot.params import Depends, RegexGroup -from nonebot.log import logger -from nonebot import on_regex, on_command from PIL import UnidentifiedImageError from pathlib import Path from typing import Any, Union, Annotated from re import I, sub import asyncio -from nonebot import require require("nonebot_plugin_localstore") require("nonebot_plugin_tortoise_orm") diff --git a/src/plugins/nonebot_plugin_status/__init__.py b/src/plugins/nonebot_plugin_status/__init__.py index e9f4075..6757e02 100644 --- a/src/plugins/nonebot_plugin_status/__init__.py +++ b/src/plugins/nonebot_plugin_status/__init__.py @@ -14,11 +14,11 @@ from typing import Any, Dict from jinja2 import Environment +from jinja2.meta import find_undeclared_variables from nonebot import get_driver from nonebot.matcher import Matcher from nonebot.permission import SUPERUSER from nonebot.plugin import PluginMetadata -from jinja2.meta import find_undeclared_variables from .config import Config from .helpers import humanize_date, relative_time, humanize_delta diff --git a/src/plugins/nonebot_plugin_wordcloud/__init__.py b/src/plugins/nonebot_plugin_wordcloud/__init__.py index e08a799..4d13e61 100644 --- a/src/plugins/nonebot_plugin_wordcloud/__init__.py +++ b/src/plugins/nonebot_plugin_wordcloud/__init__.py @@ -32,7 +32,7 @@ from nonebot.permission import SUPERUSER from nonebot.params import Arg, Depends from nonebot.adapters import Bot, Event, Message -from nonebot import get_driver +from nonebot import get_driver, require from arclet.alconna.arparma import Arparma from arclet.alconna import ArparmaBehavior import nonebot_plugin_saa as saa @@ -41,7 +41,6 @@ from io import BytesIO from datetime import datetime, timedelta import re -from nonebot import require require("nonebot_plugin_apscheduler") require("nonebot_plugin_alconna")