Skip to content

Commit 7efb6d8

Browse files
authored
Merge branch 'master' into typed-dict
2 parents 99a1f76 + c8eee71 commit 7efb6d8

File tree

8 files changed

+18
-4
lines changed

8 files changed

+18
-4
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ These changes are available on the `master` branch, but have not yet been releas
5858
([#2611](https://github.com/Pycord-Development/pycord/pull/2611))
5959
- Fixed `TypeError` when passing `skus` parameter in `Client.entitlements()`.
6060
([#2627](https://github.com/Pycord-Development/pycord/issues/2627))
61+
- Fixed `AttributeError` when sending polls with `PartialWebook`.
62+
([#2624](https://github.com/Pycord-Development/pycord/pull/2624))
6163

6264
### Changed
6365

README.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ Pycord is a modern, easy to use, feature-rich, and async ready API wrapper for D
2828

2929
======
3030

31+
Note
32+
----
33+
34+
Pycord supports Python ``3.9`` - ``3.12``
35+
3136
Key Features
3237
------------
3338

discord/enums.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ class ChannelType(Enum):
224224
stage_voice = 13
225225
directory = 14
226226
forum = 15
227+
media = 16
227228

228229
def __str__(self):
229230
return self.name

discord/types/channel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class PermissionOverwrite(TypedDict):
4545
deny: str
4646

4747

48-
ChannelType = Literal[0, 1, 2, 3, 4, 5, 10, 11, 12, 13]
48+
ChannelType = Literal[0, 1, 2, 3, 4, 5, 10, 11, 12, 13, 14, 15, 16]
4949

5050

5151
class _BaseChannel(TypedDict):

discord/ui/view.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class View:
126126
*items: :class:`Item`
127127
The initial items attached to this view.
128128
timeout: Optional[:class:`float`]
129-
Timeout in seconds from last interaction with the UI before no longer accepting input.
129+
Timeout in seconds from last interaction with the UI before no longer accepting input. Defaults to 180.0.
130130
If ``None`` then there is no timeout.
131131
132132
Attributes

discord/webhook/async_.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,12 @@ def create_user(self, data):
803803
# state parameter is artificial
804804
return BaseUser(state=self, data=data) # type: ignore
805805

806+
def store_poll(self, poll: Poll, message_id: int):
807+
if self._parent is not None:
808+
return self._parent.store_poll(poll, message_id)
809+
# state parameter is artificial
810+
return None
811+
806812
@property
807813
def http(self):
808814
if self._parent is not None:

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[build-system]
22
requires = [
3-
"setuptools>=62.6,<=72.2.0",
3+
"setuptools>=62.6,<=75.4.0",
44
"setuptools-scm>=6.2,<=8.1.0",
55
]
66
build-backend = "setuptools.build_meta"

requirements/docs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ sphinxext-opengraph==0.9.1
66
sphinx-copybutton==0.5.2
77
furo==2024.8.6
88
sphinx-autodoc-typehints==2.2.3
9-
sphinx-intl==2.2.0
9+
sphinx-intl==2.3.0
1010
typing_extensions==4.12.2
1111
levenshtein==0.26.1

0 commit comments

Comments
 (0)