diff --git a/docs/changelog.md b/docs/changelog.md index d883f211..14225c04 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -22,6 +22,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `bot.start()` can also be used if already in a running event loop. Keep in mind using it will require handling loop errors, as run() does this automatically. +### Internal + +- Code style: two blank lines after imports instead of one. (#70) ## [0.1.0] - 2021-08-13 diff --git a/modmail/__init__.py b/modmail/__init__.py index 14cd73a5..9377ffd2 100644 --- a/modmail/__init__.py +++ b/modmail/__init__.py @@ -6,6 +6,7 @@ from modmail.log import ModmailLogger + logging.TRACE = 5 logging.NOTICE = 25 logging.addLevelName(logging.TRACE, "TRACE") diff --git a/modmail/__main__.py b/modmail/__main__.py index 3da03d69..fd10af2a 100644 --- a/modmail/__main__.py +++ b/modmail/__main__.py @@ -4,6 +4,7 @@ from modmail.log import ModmailLogger from modmail.utils.embeds import patch_embed + try: # noinspection PyUnresolvedReferences from colorama import init diff --git a/modmail/bot.py b/modmail/bot.py index ba9b146e..e62f1bda 100644 --- a/modmail/bot.py +++ b/modmail/bot.py @@ -16,6 +16,7 @@ from modmail.utils.extensions import EXTENSIONS, NO_UNLOAD, walk_extensions from modmail.utils.plugins import PLUGINS, walk_plugins + REQUIRED_INTENTS = Intents( guilds=True, messages=True, diff --git a/modmail/config.py b/modmail/config.py index 6f139626..dce1efeb 100644 --- a/modmail/config.py +++ b/modmail/config.py @@ -18,6 +18,7 @@ from pydantic.env_settings import SettingsSourceCallable from pydantic.types import conint + log = logging.getLogger(__name__) CONFIG_PATHS: list = [ diff --git a/modmail/extensions/extension_manager.py b/modmail/extensions/extension_manager.py index aacee78e..dee0f01b 100644 --- a/modmail/extensions/extension_manager.py +++ b/modmail/extensions/extension_manager.py @@ -17,6 +17,7 @@ from modmail.utils.extensions import EXTENSIONS, NO_UNLOAD, unqualify, walk_extensions from modmail.utils.pagination import ButtonPaginator + log: ModmailLogger = logging.getLogger(__name__) diff --git a/modmail/extensions/meta.py b/modmail/extensions/meta.py index d90b0146..169efee0 100644 --- a/modmail/extensions/meta.py +++ b/modmail/extensions/meta.py @@ -6,6 +6,7 @@ from modmail.log import ModmailLogger from modmail.utils.cogs import ExtMetadata, ModmailCog + log: ModmailLogger = logging.getLogger(__name__) EXT_METADATA = ExtMetadata() diff --git a/modmail/extensions/plugin_manager.py b/modmail/extensions/plugin_manager.py index 57cd1950..16138c12 100644 --- a/modmail/extensions/plugin_manager.py +++ b/modmail/extensions/plugin_manager.py @@ -6,6 +6,7 @@ from modmail.utils.cogs import BotModes, ExtMetadata from modmail.utils.plugins import PLUGINS, walk_plugins + EXT_METADATA = ExtMetadata(load_if_mode=BotModes.PRODUCTION) diff --git a/modmail/extensions/utils/paginator_manager.py b/modmail/extensions/utils/paginator_manager.py index fc6efbf0..899c0d4f 100644 --- a/modmail/extensions/utils/paginator_manager.py +++ b/modmail/extensions/utils/paginator_manager.py @@ -8,6 +8,7 @@ from modmail.utils.cogs import ModmailCog + if TYPE_CHECKING: from discord import Interaction diff --git a/modmail/plugin_helpers.py b/modmail/plugin_helpers.py index d20abf8e..4770584d 100644 --- a/modmail/plugin_helpers.py +++ b/modmail/plugin_helpers.py @@ -2,6 +2,7 @@ from modmail.log import ModmailLogger from modmail.utils.cogs import BotModes, ExtMetadata, ModmailCog + __all__ = ["PluginCog", ModmailBot, ModmailLogger, BotModes, ExtMetadata] diff --git a/modmail/utils/embeds.py b/modmail/utils/embeds.py index 9d062c08..6e0bb150 100644 --- a/modmail/utils/embeds.py +++ b/modmail/utils/embeds.py @@ -5,6 +5,7 @@ from modmail.config import CONFIG + DEFAULT_COLOR = int(CONFIG.colors.embed_color.as_hex().lstrip("#"), 16) original_init = discord.Embed.__init__ diff --git a/modmail/utils/extensions.py b/modmail/utils/extensions.py index 2734bfa0..be547c50 100644 --- a/modmail/utils/extensions.py +++ b/modmail/utils/extensions.py @@ -12,6 +12,7 @@ from modmail.log import ModmailLogger from modmail.utils.cogs import BOT_MODES, BotModes, ExtMetadata + log: ModmailLogger = logging.getLogger(__name__) EXT_METADATA = ExtMetadata diff --git a/modmail/utils/pagination.py b/modmail/utils/pagination.py index f2f98fa8..e0f633a4 100644 --- a/modmail/utils/pagination.py +++ b/modmail/utils/pagination.py @@ -15,6 +15,7 @@ from modmail.utils.errors import InvalidArgumentError, MissingAttributeError + if TYPE_CHECKING: from discord import Interaction from discord.ui import Button diff --git a/modmail/utils/plugins.py b/modmail/utils/plugins.py index e6f681ac..ced30fd0 100644 --- a/modmail/utils/plugins.py +++ b/modmail/utils/plugins.py @@ -21,6 +21,7 @@ from modmail.utils.cogs import ExtMetadata from modmail.utils.extensions import BOT_MODE, unqualify + log: ModmailLogger = logging.getLogger(__name__) diff --git a/tests/test_logs.py b/tests/test_logs.py index 9f03fce0..c97957fe 100644 --- a/tests/test_logs.py +++ b/tests/test_logs.py @@ -6,6 +6,7 @@ from modmail.log import ModmailLogger + """ Test custom logging levels """ diff --git a/tox.ini b/tox.ini index dc78f84a..bc557a04 100644 --- a/tox.ini +++ b/tox.ini @@ -31,10 +31,11 @@ per-file-ignores= [isort] profile=black -multi_line_output=3 -include_trailing_comma=true -force_grid_wrap=0 -use_parentheses=true +atomic=true ensure_newline_before_comments=true +force_grid_wrap=0 +include_trailing_comma=true line_length=110 -atomic=true +lines_after_imports=2 +multi_line_output=3 +use_parentheses=true