Merge branch 'Pycord-Development:master' into master

Author: janu8ry

discord/errors.py

@@ -52,6 +52,12 @@
     'ConnectionClosed',
     'PrivilegedIntentsRequired',
     'InteractionResponded',
+    'ExtensionError',
+    'ExtensionAlreadyLoaded',
+    'ExtensionNotLoaded',
+    'NoEntryPointError',
+    'ExtensionFailed',
+    'ExtensionNotFound'
 )
 
 
@@ -275,3 +281,79 @@ class InteractionResponded(ClientException):
     def __init__(self, interaction: Interaction):
         self.interaction: Interaction = interaction
         super().__init__('This interaction has already been responded to before')
+
+class ExtensionError(DiscordException):
+    """Base exception for extension related errors.
+
+    This inherits from :exc:`~discord.DiscordException`.
+
+    Attributes
+    ------------
+    name: :class:`str`
+        The extension that had an error.
+    """
+    def __init__(self, message: Optional[str] = None, *args: Any, name: str) -> None:
+        self.name: str = name
+        message = message or f'Extension {name!r} had an error.'
+        # clean-up @everyone and @here mentions
+        m = message.replace('@everyone', '@\u200beveryone').replace('@here', '@\u200bhere')
+        super().__init__(m, *args)
+
+class ExtensionAlreadyLoaded(ExtensionError):
+    """An exception raised when an extension has already been loaded.
+
+    This inherits from :exc:`ExtensionError`
+    """
+    def __init__(self, name: str) -> None:
+        super().__init__(f'Extension {name!r} is already loaded.', name=name)
+
+class ExtensionNotLoaded(ExtensionError):
+    """An exception raised when an extension was not loaded.
+
+    This inherits from :exc:`ExtensionError`
+    """
+    def __init__(self, name: str) -> None:
+        super().__init__(f'Extension {name!r} has not been loaded.', name=name)
+
+class NoEntryPointError(ExtensionError):
+    """An exception raised when an extension does not have a ``setup`` entry point function.
+
+    This inherits from :exc:`ExtensionError`
+    """
+    def __init__(self, name: str) -> None:
+        super().__init__(f"Extension {name!r} has no 'setup' function.", name=name)
+
+class ExtensionFailed(ExtensionError):
+    """An exception raised when an extension failed to load during execution of the module or ``setup`` entry point.
+
+    This inherits from :exc:`ExtensionError`
+
+    Attributes
+    -----------
+    name: :class:`str`
+        The extension that had the error.
+    original: :exc:`Exception`
+        The original exception that was raised. You can also get this via
+        the ``__cause__`` attribute.
+    """
+    def __init__(self, name: str, original: Exception) -> None:
+        self.original: Exception = original
+        msg = f'Extension {name!r} raised an error: {original.__class__.__name__}: {original}'
+        super().__init__(msg, name=name)
+
+class ExtensionNotFound(ExtensionError):
+    """An exception raised when an extension is not found.
+
+    This inherits from :exc:`ExtensionError`
+
+    .. versionchanged:: 1.3
+        Made the ``original`` attribute always None.
+
+    Attributes
+    -----------
+    name: :class:`str`
+        The extension that had the error.
+    """
+    def __init__(self, name: str) -> None:
+        msg = f'Extension {name!r} could not be loaded.'
+        super().__init__(msg, name=name)

discord/ext/commands/errors.py

@@ -86,12 +86,6 @@
     'UnexpectedQuoteError',
     'InvalidEndOfQuotedStringError',
     'ExpectedClosingQuoteError',
-    'ExtensionError',
-    'ExtensionAlreadyLoaded',
-    'ExtensionNotLoaded',
-    'NoEntryPointError',
-    'ExtensionFailed',
-    'ExtensionNotFound',
     'CommandRegistrationError',
     'FlagError',
     'BadFlagArgument',
@@ -818,82 +812,6 @@ def __init__(self, close_quote: str) -> None:
         self.close_quote: str = close_quote
         super().__init__(f'Expected closing {close_quote}.')
 
-class ExtensionError(DiscordException):
-    """Base exception for extension related errors.
-
-    This inherits from :exc:`~discord.DiscordException`.
-
-    Attributes
-    ------------
-    name: :class:`str`
-        The extension that had an error.
-    """
-    def __init__(self, message: Optional[str] = None, *args: Any, name: str) -> None:
-        self.name: str = name
-        message = message or f'Extension {name!r} had an error.'
-        # clean-up @everyone and @here mentions
-        m = message.replace('@everyone', '@\u200beveryone').replace('@here', '@\u200bhere')
-        super().__init__(m, *args)
-
-class ExtensionAlreadyLoaded(ExtensionError):
-    """An exception raised when an extension has already been loaded.
-
-    This inherits from :exc:`ExtensionError`
-    """
-    def __init__(self, name: str) -> None:
-        super().__init__(f'Extension {name!r} is already loaded.', name=name)
-
-class ExtensionNotLoaded(ExtensionError):
-    """An exception raised when an extension was not loaded.
-
-    This inherits from :exc:`ExtensionError`
-    """
-    def __init__(self, name: str) -> None:
-        super().__init__(f'Extension {name!r} has not been loaded.', name=name)
-
-class NoEntryPointError(ExtensionError):
-    """An exception raised when an extension does not have a ``setup`` entry point function.
-
-    This inherits from :exc:`ExtensionError`
-    """
-    def __init__(self, name: str) -> None:
-        super().__init__(f"Extension {name!r} has no 'setup' function.", name=name)
-
-class ExtensionFailed(ExtensionError):
-    """An exception raised when an extension failed to load during execution of the module or ``setup`` entry point.
-
-    This inherits from :exc:`ExtensionError`
-
-    Attributes
-    -----------
-    name: :class:`str`
-        The extension that had the error.
-    original: :exc:`Exception`
-        The original exception that was raised. You can also get this via
-        the ``__cause__`` attribute.
-    """
-    def __init__(self, name: str, original: Exception) -> None:
-        self.original: Exception = original
-        msg = f'Extension {name!r} raised an error: {original.__class__.__name__}: {original}'
-        super().__init__(msg, name=name)
-
-class ExtensionNotFound(ExtensionError):
-    """An exception raised when an extension is not found.
-
-    This inherits from :exc:`ExtensionError`
-
-    .. versionchanged:: 1.3
-        Made the ``original`` attribute always None.
-
-    Attributes
-    -----------
-    name: :class:`str`
-        The extension that had the error.
-    """
-    def __init__(self, name: str) -> None:
-        msg = f'Extension {name!r} could not be loaded.'
-        super().__init__(msg, name=name)
-
 class CommandRegistrationError(ClientException):
     """An exception raised when the command can't be added
     because the name is already taken by a different command.