From e6a9a8d283d394b3b8baae7bd4aed80b13c3132f Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Sat, 15 Apr 2023 21:53:20 +0200 Subject: [PATCH] Move cli_level_to_log_level to redbot.core.cli to fix circular import --- redbot/core/_cli.py | 15 +++++++++++++-- redbot/core/utils/_internal_utils.py | 14 -------------- redbot/setup.py | 3 +-- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/redbot/core/_cli.py b/redbot/core/_cli.py index 169f2eb79c51..c411b9118cd9 100644 --- a/redbot/core/_cli.py +++ b/redbot/core/_cli.py @@ -7,8 +7,7 @@ import discord from discord import __version__ as discord_version - -from redbot.core.utils._internal_utils import cli_level_to_log_level +from red_commons.logging import VERBOSE, TRACE # This needs to be an int enum to be used @@ -324,3 +323,15 @@ def parse_cli_flags(args): args.logging_level = cli_level_to_log_level(args.logging_level) return args + + +def cli_level_to_log_level(level: int) -> int: + if level == 0: + log_level = logging.INFO + elif level == 1: + log_level = logging.DEBUG + elif level == 2: + log_level = VERBOSE + else: + log_level = TRACE + return log_level diff --git a/redbot/core/utils/_internal_utils.py b/redbot/core/utils/_internal_utils.py index 7f9d2ef2a764..7f464c648040 100644 --- a/redbot/core/utils/_internal_utils.py +++ b/redbot/core/utils/_internal_utils.py @@ -35,7 +35,6 @@ from rapidfuzz import fuzz, process from rich.progress import ProgressColumn from rich.progress_bar import ProgressBar -from red_commons.logging import VERBOSE, TRACE from redbot import VersionInfo from redbot.core import _data_manager, data_manager @@ -58,7 +57,6 @@ "fetch_latest_red_version_info", "deprecated_removed", "RichIndefiniteBarColumn", - "cli_level_to_log_level", ) _T = TypeVar("_T") @@ -359,15 +357,3 @@ def render(self, task): total=task.total, completed=task.completed, ) - - -def cli_level_to_log_level(level: int) -> int: - if level == 0: - log_level = logging.INFO - elif level == 1: - log_level = logging.DEBUG - elif level == 2: - log_level = VERBOSE - else: - log_level = TRACE - return log_level diff --git a/redbot/setup.py b/redbot/setup.py index 507a5251c468..2a28ea7d0d59 100644 --- a/redbot/setup.py +++ b/redbot/setup.py @@ -14,11 +14,10 @@ import click -from redbot.core._cli import confirm +from redbot.core._cli import cli_level_to_log_level, confirm from redbot.core.utils._internal_utils import ( safe_delete, create_backup as red_create_backup, - cli_level_to_log_level, ) from redbot.core import config, data_manager, _data_manager, _drivers from redbot.core._cli import ExitCodes