fix: merge conflicts

Author: Icebluewolf

CHANGELOG.md

@@ -10,7 +10,7 @@ possible (see our [Version Guarantees] for more info).
 
 These changes are available on the `master` branch, but have not yet been released.
 
-⚠️ **This Version Removes Support For Python 3.8** ⚠️
+⚠️ **This version removes support for Python 3.8.** ⚠️
 
 ### Added
 
@@ -23,39 +23,50 @@ These changes are available on the `master` branch, but have not yet been releas
 - Added `Member.guild_banner` and `Member.display_banner` properties.
   ([#2556](https://github.com/Pycord-Development/pycord/pull/2556))
 
+### Fixed
+
+- Fix `Enum` options not setting the correct type when only one choice is available.
+  ([#2577](https://github.com/Pycord-Development/pycord/pull/2577))
+
 ### Changed
 
 - Renamed `cover` property of `ScheduledEvent` and `cover` argument of
   `ScheduledEvent.edit` to `image`.
   ([#2496](https://github.com/Pycord-Development/pycord/pull/2496))
-- ⚠️ **This Version Removes Support For Python 3.8** ⚠️
+- ⚠️ **Removed support for Python 3.8.**
   ([#2521](https://github.com/Pycord-Development/pycord/pull/2521))
 
 ### Deprecated
 
 - Deprecated `AppInfo.summary` in favor of `AppInfo.description`.
   ([#2520](https://github.com/Pycord-Development/pycord/pull/2520))
 
+## [2.6.1] - 2024-09-15
+
 ### Fixed
 
-- Fixed `EntitlementIterator` behavior with `limit > 100`.
+- Fixed premature garbage collection of tasks.
+  ([#2510](https://github.com/Pycord-Development/pycord/pull/2510))
+- Fixed `EntitlementIterator` type hints and behavior with `limit > 100`.
   ([#2555](https://github.com/Pycord-Development/pycord/pull/2555))
 - Fixed missing `stacklevel` parameter in `warn_deprecated` function call inside
   `@utils.deprecated`. ([#2500](https://github.com/Pycord-Development/pycord/pull/2500))
-- Fixed the typehint in `ConnectionState._polls` to reflect actual behavior, changing it
-  from `Guild` to `Poll`.
+- Fixed the type hint in `ConnectionState._polls` to reflect actual behavior, changing
+  it from `Guild` to `Poll`.
   ([#2500](https://github.com/Pycord-Development/pycord/pull/2500))
 - Fixed missing `__slots__` attributes in `RawReactionClearEmojiEvent` and
   `RawMessagePollVoteEvent`.
   ([#2500](https://github.com/Pycord-Development/pycord/pull/2500))
 - Fixed the type of `ForumChannel.default_sort_order`, changing it from `int` to
   `SortOrder`. ([#2500](https://github.com/Pycord-Development/pycord/pull/2500))
-- Fixed `PartialMessage`s causing errors when created from `PartialMessageable`.
+- Fixed `PartialMessage` causing errors when created from `PartialMessageable`.
   ([#2568](https://github.com/Pycord-Development/pycord/pull/2500))
 - Fixed the `guild` attribute of `Member`s recieved from a `UserCommand` being `None`.
   ([#2573](https://github.com/Pycord-Development/pycord/pull/2573))
-- Fixed `Webhook.send` not including `Attachment` data.
+- Fixed `Webhook.send` not including attachment data.
   ([#2513](https://github.com/Pycord-Development/pycord/pull/2513))
+- Fixed inverted type hints in `CheckAnyFailure`.
+  ([#2502](https://github.com/Pycord-Development/pycord/pull/2502))
 
 ## [2.6.0] - 2024-07-09
 

discord/commands/options.py

@@ -198,7 +198,7 @@ def __init__(
         enum_choices = []
         input_type_is_class = isinstance(input_type, type)
         if input_type_is_class and issubclass(input_type, (Enum, DiscordEnum)):
-            if description is None:
+            if description is None and input_type.__doc__ is not None:
                 description = inspect.cleandoc(input_type.__doc__)
                 if description and len(description) > 100:
                     description = description[:97] + "..."
@@ -209,7 +209,9 @@ def __init__(
                     )
             enum_choices = [OptionChoice(e.name, e.value) for e in input_type]
             value_class = enum_choices[0].value.__class__
-            if all(isinstance(elem.value, value_class) for elem in enum_choices):
+            if value_class in SlashCommandOptionType.__members__ and all(
+                isinstance(elem.value, value_class) for elem in enum_choices
+            ):
                 input_type = SlashCommandOptionType.from_datatype(
                     enum_choices[0].value.__class__
                 )

discord/http.py

@@ -413,11 +413,17 @@ async def static_login(self, token: str) -> user.User:
         # TODO: Remove This When Testing Is Done
         import logging
 
-        async def on_request_start(session, context, params: aiohttp.TraceRequestStartParams):
+        async def on_request_start(
+            session, context, params: aiohttp.TraceRequestStartParams
+        ):
             # breakpoint()
-            logging.getLogger('aiohttp.client').debug(f'Starting request <{params}> <{session}> <{context}>')
+            logging.getLogger("aiohttp.client").debug(
+                f"Starting request <{params}> <{session}> <{context}>"
+            )
 
-        async def on_request_chunk_sent(session, context, params: aiohttp.TraceRequestChunkSentParams):
+        async def on_request_chunk_sent(
+            session, context, params: aiohttp.TraceRequestChunkSentParams
+        ):
             with open("output.txt", "a") as file:
                 if byte := str(params.chunk).find(r"\x", 100) != -1:
                     file.write(str(params.chunk)[:byte] + "\n")
@@ -431,7 +437,9 @@ async def on_request_chunk_sent(session, context, params: aiohttp.TraceRequestCh
 
         # Necessary to get aiohttp to stop complaining about session creation
         self.__session = aiohttp.ClientSession(
-            connector=self.connector, ws_response_class=DiscordClientWebSocketResponse, trace_configs=[trace_config]
+            connector=self.connector,
+            ws_response_class=DiscordClientWebSocketResponse,
+            trace_configs=[trace_config],
         )
         old_token = self.token
         self.token = token
@@ -659,8 +667,8 @@ def edit_multipart_helper(
                     "id": index,
                     "filename": file.filename,
                     "description": file.description,
-                    "waveform": "AADz/+z/Pf+jBCD8pQE++8sDOv5H/WAH6PvR/uP8mfGCGnkCnAg58y77ewGH/U79AwXc9yUGlvloFmcF5fx9+kwFMQV8+GYDaf1oAToEmfm9APcB7gWs/mYEGgB5/VT9sfv3AAYCBALl/kX9jgDsA6UCLvtABNv/g/65/QP+xf2QAxsA8gKI/J3+1f5vBcAC5/ps/mQDigGn+FcEZAIZ/lYClP3a/rwEw/2g++wDpPoMB/36jAKPAC7+2wFo/IoBMgG2Aib9ivxqBFn7JwBn/LUEHP1R/T4EYv77AIoBd/wRBRX+DvwTA+4C0/l3AHQEiv98+n8B1wPj/DkA/gGp/zr7GQJv/HwAevlPBon8UP7bAyj/uAJp/SsCjPssAif/kP7bBIn9sQHq/9j94/+aADH+KQCcASj/1gHr/uYA/P1UAiz+XgEkANL9GgG8Adr+Mv/H/w8BgP+aASf+bAAgAE0AS/4hAWUASP/VAE3/5P5tAd39fQLq/zD/wADU/sgAo//T/zQBg/6nANf/8v/IAHH/iQCd/wQAEACa/3cA8v/s/x8A4v///xkA2v8QAA8A7P8LAPz/AAABAP3/AAAAAP//AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
-                    "duration_secs": 10.032
+                    "waveform": "37WKcJ6jlLSVnaabsbeip4KPmHJXUUEbExgFJE8J7iNPFggpKQkTNl95dobFqqe2tKubnbSTX3yLVVBFS4iqd4dbKmFvMChwfVRKfWFYWRpLaV9jlYtKWWZde6mtnYiDlGNUgmFAWWdRXGNsf2NBYnNcS1uDjm+qwK2urKe8uKqjZ2KGSjtbLUpTO0iDYSBSg6CzCk1LNDVAZnOAvNiUkLu8r8vPnFw6bXZbbXcn0vUU8q2q38Olyfb0y7OhlnV9u6N4zuAH9uI=",
+                    "duration_secs": 60.0,
                 }
             )
             form.append(