From 5a492aceb314815fd6ff91aca42c8064d224d69d Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Sat, 12 Feb 2022 11:22:39 +0800 Subject: [PATCH] format code --- .../nonebot_bison/admin_page/__init__.py | 24 +++++++++---------- src/plugins/nonebot_bison/config.py | 2 +- .../nonebot_bison/platform/arknights.py | 4 ++-- .../nonebot_bison/platform/platform.py | 2 +- src/plugins/nonebot_bison/platform/rss.py | 2 +- src/plugins/nonebot_bison/platform/wechat.py | 4 ++-- src/plugins/nonebot_bison/platform/weibo.py | 6 ++--- src/plugins/nonebot_bison/post.py | 2 +- src/plugins/nonebot_bison/scheduler.py | 2 +- src/plugins/nonebot_bison/utils.py | 6 ++--- tests/conftest.py | 4 ++-- tests/platforms/test_arknights.py | 4 ++-- tests/platforms/test_bilibili.py | 2 +- tests/platforms/test_ncm_artist.py | 4 ++-- tests/platforms/test_ncm_radio.py | 4 ++-- tests/platforms/test_platform.py | 2 +- tests/platforms/test_weibo.py | 4 ++-- tests/test_config_manager.py | 2 +- tests/test_merge_pic.py | 2 +- tests/test_render.py | 2 +- 20 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/plugins/nonebot_bison/admin_page/__init__.py b/src/plugins/nonebot_bison/admin_page/__init__.py index 0b878cf..eaecd1c 100644 --- a/src/plugins/nonebot_bison/admin_page/__init__.py +++ b/src/plugins/nonebot_bison/admin_page/__init__.py @@ -1,32 +1,32 @@ import os +from dataclasses import dataclass from pathlib import Path from typing import Union -from dataclasses import dataclass import socketio -from nonebot.log import logger -from nonebot.rule import to_me -from nonebot.params import State -from nonebot.typing import T_State -from nonebot import get_driver, on_command -from nonebot.drivers.fastapi import Driver from fastapi.staticfiles import StaticFiles +from nonebot import get_driver, on_command from nonebot.adapters.onebot.v11 import Bot from nonebot.adapters.onebot.v11.event import GroupMessageEvent, PrivateMessageEvent +from nonebot.drivers.fastapi import Driver +from nonebot.log import logger +from nonebot.params import State +from nonebot.rule import to_me +from nonebot.typing import T_State -from .jwt import load_jwt from ..plugin_config import plugin_config -from .token_manager import token_manager as tm from .api import ( - auth, - test, add_group_sub, + auth, del_group_sub, - get_subs_info, get_global_conf, + get_subs_info, get_target_name, + test, update_group_sub, ) +from .jwt import load_jwt +from .token_manager import token_manager as tm URL_BASE = "/bison/" GLOBAL_CONF_URL = f"{URL_BASE}api/global_conf" diff --git a/src/plugins/nonebot_bison/config.py b/src/plugins/nonebot_bison/config.py index 3a98006..a021aeb 100644 --- a/src/plugins/nonebot_bison/config.py +++ b/src/plugins/nonebot_bison/config.py @@ -1,5 +1,5 @@ -from collections import defaultdict import os +from collections import defaultdict from os import path from typing import DefaultDict, Literal, Mapping, TypedDict diff --git a/src/plugins/nonebot_bison/platform/arknights.py b/src/plugins/nonebot_bison/platform/arknights.py index 506d261..f7b0002 100644 --- a/src/plugins/nonebot_bison/platform/arknights.py +++ b/src/plugins/nonebot_bison/platform/arknights.py @@ -5,9 +5,9 @@ import httpx from bs4 import BeautifulSoup as bs from ..post import Post +from ..types import Category, RawPost, Target from ..utils import Render -from ..types import Target, RawPost, Category -from .platform import NewMessage, StatusChange, CategoryNotSupport +from .platform import CategoryNotSupport, NewMessage, StatusChange class Arknights(NewMessage): diff --git a/src/plugins/nonebot_bison/platform/platform.py b/src/plugins/nonebot_bison/platform/platform.py index 34cdb76..1bec3d8 100644 --- a/src/plugins/nonebot_bison/platform/platform.py +++ b/src/plugins/nonebot_bison/platform/platform.py @@ -1,7 +1,7 @@ +import time from abc import ABC, abstractmethod from collections import defaultdict from dataclasses import dataclass -import time from typing import Any, Collection, Literal, Optional import httpx diff --git a/src/plugins/nonebot_bison/platform/rss.py b/src/plugins/nonebot_bison/platform/rss.py index 2adde67..330d93d 100644 --- a/src/plugins/nonebot_bison/platform/rss.py +++ b/src/plugins/nonebot_bison/platform/rss.py @@ -1,9 +1,9 @@ import calendar from typing import Any, Optional -from bs4 import BeautifulSoup as bs import feedparser import httpx +from bs4 import BeautifulSoup as bs from ..post import Post from ..types import RawPost, Target diff --git a/src/plugins/nonebot_bison/platform/wechat.py b/src/plugins/nonebot_bison/platform/wechat.py index 42850fd..f0d0d11 100644 --- a/src/plugins/nonebot_bison/platform/wechat.py +++ b/src/plugins/nonebot_bison/platform/wechat.py @@ -1,11 +1,11 @@ -from datetime import datetime import hashlib import json import re +from datetime import datetime from typing import Any, Optional -from bs4 import BeautifulSoup as bs import httpx +from bs4 import BeautifulSoup as bs from ..types import * diff --git a/src/plugins/nonebot_bison/platform/weibo.py b/src/plugins/nonebot_bison/platform/weibo.py index 99b9818..365e3b2 100644 --- a/src/plugins/nonebot_bison/platform/weibo.py +++ b/src/plugins/nonebot_bison/platform/weibo.py @@ -1,14 +1,14 @@ -import re import json +import re from datetime import datetime from typing import Any, Optional import httpx -from nonebot import logger from bs4 import BeautifulSoup as bs +from nonebot import logger -from ..types import * from ..post import Post +from ..types import * from .platform import NewMessage diff --git a/src/plugins/nonebot_bison/post.py b/src/plugins/nonebot_bison/post.py index 96c1514..c73e986 100644 --- a/src/plugins/nonebot_bison/post.py +++ b/src/plugins/nonebot_bison/post.py @@ -4,10 +4,10 @@ from functools import reduce from io import BytesIO from typing import Optional, Union -from PIL import Image import httpx from nonebot import logger from nonebot.adapters.onebot.v11.message import Message, MessageSegment +from PIL import Image from .plugin_config import plugin_config from .utils import parse_text diff --git a/src/plugins/nonebot_bison/scheduler.py b/src/plugins/nonebot_bison/scheduler.py index 9ff4b2c..c9c8d7c 100644 --- a/src/plugins/nonebot_bison/scheduler.py +++ b/src/plugins/nonebot_bison/scheduler.py @@ -1,7 +1,7 @@ import logging -from apscheduler.schedulers.asyncio import AsyncIOScheduler import nonebot +from apscheduler.schedulers.asyncio import AsyncIOScheduler from nonebot import get_driver, logger from nonebot.log import LoguruHandler diff --git a/src/plugins/nonebot_bison/utils.py b/src/plugins/nonebot_bison/utils.py index ac3f85f..3d54220 100644 --- a/src/plugins/nonebot_bison/utils.py +++ b/src/plugins/nonebot_bison/utils.py @@ -1,17 +1,17 @@ import asyncio import base64 -from html import escape import os -from pathlib import Path import platform import re import subprocess import sys +from html import escape +from pathlib import Path from time import asctime from typing import Awaitable, Callable, Optional, Union -from bs4 import BeautifulSoup as bs import nonebot +from bs4 import BeautifulSoup as bs from nonebot.adapters.onebot.v11.message import MessageSegment from nonebot.log import default_format, logger from playwright._impl._driver import compute_driver_executable diff --git a/tests/conftest.py b/tests/conftest.py index 31dc490..4710617 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,9 +1,9 @@ -from pathlib import Path import typing +from pathlib import Path import nonebot -from nonebug.app import App import pytest +from nonebug.app import App @pytest.fixture diff --git a/tests/platforms/test_arknights.py b/tests/platforms/test_arknights.py index 1a3890c..cd55501 100644 --- a/tests/platforms/test_arknights.py +++ b/tests/platforms/test_arknights.py @@ -1,7 +1,7 @@ -from httpx import Response -from nonebug.app import App import pytest import respx +from httpx import Response +from nonebug.app import App from .utils import get_file, get_json diff --git a/tests/platforms/test_bilibili.py b/tests/platforms/test_bilibili.py index 4bccb3d..5fc2b28 100644 --- a/tests/platforms/test_bilibili.py +++ b/tests/platforms/test_bilibili.py @@ -1,6 +1,6 @@ +import pytest from httpx import Response from nonebug.app import App -import pytest from .utils import get_json diff --git a/tests/platforms/test_ncm_artist.py b/tests/platforms/test_ncm_artist.py index 2ebcda8..354b2a6 100644 --- a/tests/platforms/test_ncm_artist.py +++ b/tests/platforms/test_ncm_artist.py @@ -1,9 +1,9 @@ import time -from httpx import Response -from nonebug.app import App import pytest import respx +from httpx import Response +from nonebug.app import App from .utils import get_json diff --git a/tests/platforms/test_ncm_radio.py b/tests/platforms/test_ncm_radio.py index 4386e44..d191c6f 100644 --- a/tests/platforms/test_ncm_radio.py +++ b/tests/platforms/test_ncm_radio.py @@ -1,9 +1,9 @@ import time -from httpx import Response -from nonebug.app import App import pytest import respx +from httpx import Response +from nonebug.app import App from .utils import get_json diff --git a/tests/platforms/test_platform.py b/tests/platforms/test_platform.py index e78348c..7bf0578 100644 --- a/tests/platforms/test_platform.py +++ b/tests/platforms/test_platform.py @@ -1,8 +1,8 @@ from time import time from typing import Any, Optional -from nonebug.app import App import pytest +from nonebug.app import App now = time() passed = now - 3 * 60 * 60 diff --git a/tests/platforms/test_weibo.py b/tests/platforms/test_weibo.py index 9280ca6..c241408 100644 --- a/tests/platforms/test_weibo.py +++ b/tests/platforms/test_weibo.py @@ -1,11 +1,11 @@ from datetime import datetime import feedparser +import pytest +import respx from httpx import Response from nonebug.app import App -import pytest from pytz import timezone -import respx from .utils import get_file, get_json diff --git a/tests/test_config_manager.py b/tests/test_config_manager.py index 982d4b8..1673309 100644 --- a/tests/test_config_manager.py +++ b/tests/test_config_manager.py @@ -1,7 +1,7 @@ import typing -from nonebug.app import App import pytest +from nonebug.app import App if typing.TYPE_CHECKING: import sys diff --git a/tests/test_merge_pic.py b/tests/test_merge_pic.py index 1d8a8d7..9e1a34b 100644 --- a/tests/test_merge_pic.py +++ b/tests/test_merge_pic.py @@ -1,7 +1,7 @@ import typing -from nonebug.app import App import pytest +from nonebug.app import App if typing.TYPE_CHECKING: import sys diff --git a/tests/test_render.py b/tests/test_render.py index ed08b6c..646e3b7 100644 --- a/tests/test_render.py +++ b/tests/test_render.py @@ -1,7 +1,7 @@ import typing -from nonebug.app import App import pytest +from nonebug.app import App if typing.TYPE_CHECKING: import sys