merge master into permissions-v2

discord/bot.py

@@ -257,7 +257,7 @@ def _check_command(cmd: ApplicationCommand, match: Dict) -> bool:
                 as_dict = cmd.to_dict()
                 to_check = {
                     "dm_permission": None,
-            "default_member_permissions": None,
+                    "default_member_permissions": None,
                     "name": None,
                     "description": None,
                     "name_localizations": None,

discord/commands/core.py

@@ -1624,42 +1624,42 @@ def validate_chat_input_name(name: Any, locale: Optional[str] = None):
     # Must meet the regex ^[\w-]{1,32}$
     if locale is not None and locale not in valid_locales:
         raise ValidationError(
-            f"Locale '{locale}' is not a valid locale, "
-            f"see {docs}/reference#locales for list of supported locales."
+            f"Locale '{locale}' is not a valid locale, " f"see {docs}/reference#locales for list of supported locales."
         )
     error = None
     if not isinstance(name, str):
-        error = TypeError(f"Command names and options must be of type str. Received \"{name}\"")
+        error = TypeError(f'Command names and options must be of type str. Received "{name}"')
     elif not re.match(r"^[\w-]{1,32}$", name):
         error = ValidationError(
             r"Command names and options must follow the regex \"^[\w-]{1,32}$\". For more information, see "
             f"{docs}/interactions/application-commands#application-command-object-application-command-naming. "
-            f"Received \"{name}\""
+            f'Received "{name}"'
         )
     elif not 1 <= len(name) <= 32:
-        error = ValidationError(f"Command names and options must be 1-32 characters long. Received \"{name}\"")
+        error = ValidationError(f'Command names and options must be 1-32 characters long. Received "{name}"')
     elif not name.lower() == name:  # Can't use islower() as it fails if none of the chars can be lower. See #512.
-        error = ValidationError(f"Command names and options must be lowercase. Received \"{name}\"")
+        error = ValidationError(f'Command names and options must be lowercase. Received "{name}"')
 
     if error:
         if locale:
-            error.args = (error.args[0]+f" in locale {locale}",)
+            error.args = (f"{error.args[0]} in locale {locale}",)
         raise error
 
 
 def validate_chat_input_description(description: Any, locale: Optional[str] = None):
     if locale is not None and locale not in valid_locales:
         raise ValidationError(
-            f"Locale '{locale}' is not a valid locale, "
-            f"see {docs}/reference#locales for list of supported locales."
+            f"Locale '{locale}' is not a valid locale, " f"see {docs}/reference#locales for list of supported locales."
         )
     error = None
     if not isinstance(description, str):
-        error = TypeError(f"Command and option description must be of type str. Received \"{description}\"")
+        error = TypeError(f'Command and option description must be of type str. Received "{description}"')
     elif not 1 <= len(description) <= 100:
-        error = ValidationError(f"Command and option description must be 1-100 characters long. Received \"{description}\"")
+        error = ValidationError(
+            f'Command and option description must be 1-100 characters long. Received "{description}"'
+        )
 
     if error:
         if locale:
-            error.args = (error.args[0]+f" in locale {locale}",)
+            error.args = (f"{error.args[0]} in locale {locale}",)
         raise error