Move private things in modlog and redbot.core.errors (#6020)

redbot/core/_drivers/_mongo.py

@@ -18,7 +18,7 @@ except ModuleNotFoundError:
     pymongo = None
 
 from .. import errors
-from .base import BaseDriver, IdentifierData
+from .base import BaseDriver, IdentifierData, MissingExtraRequirements
 
 __all__ = ["MongoDriver"]
 
@@ -33,7 +33,7 @@ class MongoDriver(BaseDriver):
     @classmethod
     async def initialize(cls, **storage_details) -> None:
         if motor is None:
-            raise errors.MissingExtraRequirements(
+            raise MissingExtraRequirements(
                 "Red must be installed with the [mongo] extra to use the MongoDB driver"
             )
         uri = storage_details.get("URI", "mongodb")

redbot/core/_drivers/base.py

@@ -6,7 +6,11 @@ import rich.progress
 
 from redbot.core.utils._internal_utils import RichIndefiniteBarColumn
 
-__all__ = ["BaseDriver", "IdentifierData", "ConfigCategory"]
+__all__ = ("BaseDriver", "IdentifierData", "ConfigCategory", "MissingExtraRequirements")
+
+
+class MissingExtraRequirements(Exception):
+    """Raised when an extra requirement is missing but required."""
 
 
 class ConfigCategory(str, enum.Enum):

redbot/core/_drivers/postgres/postgres.py

@@ -11,7 +11,7 @@ except ModuleNotFoundError:
     asyncpg = None
 
 from ... import data_manager, errors
-from ..base import BaseDriver, IdentifierData, ConfigCategory
+from ..base import BaseDriver, IdentifierData, ConfigCategory, MissingExtraRequirements
 from ..log import log
 
 __all__ = ["PostgresDriver"]
@@ -41,7 +41,7 @@ class PostgresDriver(BaseDriver):
     @classmethod
     async def initialize(cls, **storage_details) -> None:
         if asyncpg is None:
-            raise errors.MissingExtraRequirements(
+            raise MissingExtraRequirements(
                 "Red must be installed with the [postgres] extra to use the PostgreSQL driver"
             )
         cls._pool = await asyncpg.create_pool(**storage_details)

redbot/core/core_commands.py

@@ -2757,7 +2757,7 @@ class Core(commands.commands._RuleDropper, commands.Cog, CoreLogic):
     @modlogset.command(hidden=True, name="fixcasetypes")
     async def modlogset_fixcasetypes(self, ctx: commands.Context):
         """Command to fix misbehaving casetypes."""
-        await modlog.handle_auditype_key()
+        await modlog._handle_audit_type_key()
         await ctx.tick()
 
     @modlogset.command(aliases=["channel"], name="modlog")

redbot/core/errors.py

@@ -67,10 +67,6 @@ class BankPruneError(BankError):
     """Raised when trying to prune a local bank and no server is specified."""
 
 
-class MissingExtraRequirements(RedError):
-    """Raised when an extra requirement is missing but required."""
-
-
 class ConfigError(RedError):
     """Error in a Config operation."""
 

redbot/core/modlog.py

@@ -120,7 +120,7 @@ async def _init(bot: Red):
     bot.add_listener(on_audit_log_entry_create)
 
 
-async def handle_auditype_key():
+async def _handle_audit_type_key():
     all_casetypes = {
         casetype_name: {
             inner_key: inner_value
@@ -162,7 +162,7 @@ async def _migrate_config(from_version: int, to_version: int):
             )
 
     if from_version < 3 <= to_version:
-        await handle_auditype_key()
+        await _handle_audit_type_key()
         await _config.schema_version.set(3)
 
     if from_version < 4 <= to_version: