style: enable py3.10 linting rules #1449

onerandomusername · 2025-10-20T02:52:43Z

Summary

Checklist

If code changes were made, then they have been tested
- I have updated the documentation to reflect the changes
- I have formatted the code properly by running uv run nox -s lint
- I have type-checked the code by running uv run nox -s pyright
This PR fixes an issue
This PR adds something new (e.g. new method or parameters)
This PR is a breaking change (e.g. methods or parameters removed/renamed)
This PR is not a code change (e.g. documentation, README, ...)

read-the-docs-community · 2025-10-20T02:54:25Z

Documentation build overview

📚 disnake | 🛠️ Build #30001965 | 📁 Comparing 1ebea09 against latest (a9d45ed)

🔍 Preview build

Show files changed (48 files in total): 📝 48 modified | ➕ 0 added | ➖ 0 deleted

File	Status
index.html	📝 modified
whats_new.html	📝 modified
api/abc.html	📝 modified
api/activities.html	📝 modified
api/app_commands.html	📝 modified
api/app_info.html	📝 modified
api/audit_logs.html	📝 modified
api/automod.html	📝 modified
api/channels.html	📝 modified
api/clients.html	📝 modified
api/components.html	📝 modified
api/emoji.html	📝 modified
api/entitlements.html	📝 modified
api/events.html	📝 modified
api/exceptions.html	📝 modified
api/guild_scheduled_events.html	📝 modified
api/guilds.html	📝 modified
api/integrations.html	📝 modified
api/interactions.html	📝 modified
api/invites.html	📝 modified
api/localization.html	📝 modified
api/members.html	📝 modified
api/messages.html	📝 modified
api/misc.html	📝 modified
api/permissions.html	📝 modified
api/roles.html	📝 modified
api/skus.html	📝 modified
api/soundboard.html	📝 modified
api/stage_instances.html	📝 modified
api/stickers.html	📝 modified
api/subscriptions.html	📝 modified
api/ui.html	📝 modified
api/users.html	📝 modified
api/utilities.html	📝 modified
api/voice.html	📝 modified
api/webhooks.html	📝 modified
api/widgets.html	📝 modified
ext/tasks/index.html	📝 modified
ext/commands/api/app_commands.html	📝 modified
ext/commands/api/bots.html	📝 modified
ext/commands/api/checks.html	📝 modified
ext/commands/api/cogs.html	📝 modified
ext/commands/api/context.html	📝 modified
ext/commands/api/converters.html	📝 modified
ext/commands/api/exceptions.html	📝 modified
ext/commands/api/help_commands.html	📝 modified
ext/commands/api/misc.html	📝 modified
ext/commands/api/prefix_commands.html	📝 modified

onerandomusername · 2025-10-20T04:53:40Z

Partially blocked by python/cpython#140348, though we can revert those aspects.

onerandomusername · 2025-10-20T06:36:58Z

We should probably revert a portion of d602ba0 with regards to Union | str not working on 3.14 as it currently stands.

Enegg · 2025-10-20T16:42:15Z

We should probably revert a portion of d602ba0 with regards to Union | str not working on 3.14 as it currently stands.

Alternatively, we could stringify those unions.

shiftinv · 2025-10-29T14:49:07Z

disnake/abc.py

+    MessageableChannel: TypeAlias = GuildMessageable | DMChannel | GroupChannel | PartialMessageable
    # include non-messageable channels, e.g. category/forum
-    AnyChannel = Union[MessageableChannel, AnyGuildChannel]
+    AnyChannel: TypeAlias = MessageableChannel | AnyGuildChannel


Is there a reason to explicitly use TypeAlias for unions like this?

ruff doesn't detect they're unions and therefore doesn't autofix them :^)

shiftinv · 2025-10-29T15:02:45Z

disnake/mixins.py

@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: MIT

+


Suggested change

shiftinv · 2025-10-29T15:02:56Z

disnake/ext/mypy_plugin/__init__.py

@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: MIT

+


Suggested change

shiftinv · 2025-10-29T15:04:04Z

disnake/types/i18n.py

@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: MIT

+


Suggested change

shiftinv · 2025-10-29T15:10:03Z

tests/test_utils.py

+        ("int | float", Union[int, float], True),  # noqa: UP007
+        ("int | float", int | float, True),


Suggested change

("int | float", Union[int, float], True), # noqa: UP007

("int | float", int | float, True),

("int | float", int | float, True),

Since this one is testing the 3.10 union syntax, I think it's the only one where we don't necessarily need both test cases

shiftinv · 2025-10-29T15:11:56Z

tests/test_utils.py

+    @pytest.mark.parametrize(
+        "typehint",
+        [
+            Union[int, str],  # noqa: UP007
+            int | str,
+        ],
+    )
+    def test_forwardref_local(self, typehint) -> None:
+        IntOrStr = typehint


Suggested change

@pytest.mark.parametrize(

"typehint",

[

Union[int, str], # noqa: UP007

int | str,

],

)

def test_forwardref_local(self, typehint) -> None:

IntOrStr = typehint

def test_forwardref_local(self) -> None:

IntOrStr = int | str

The point of this test isn't unions, it was more of a means to an end; we can simply use the new syntax here.

shiftinv · 2025-10-29T15:12:41Z

tests/test_utils.py

+    @pytest.mark.parametrize(
+        "typehint",
+        [
+            Union[int, str],  # noqa: UP007
+            int | str,
+        ],
+    )
+    def test_forwardref_mixed(self, typehint) -> None:
+        LocalIntOrStr = typehint


same here:

Suggested change

@pytest.mark.parametrize(

"typehint",

[

Union[int, str], # noqa: UP007

int | str,

],

)

def test_forwardref_mixed(self, typehint) -> None:

LocalIntOrStr = typehint

def test_forwardref_mixed(self) -> None:

LocalIntOrStr = int | str

onerandomusername added 4 commits October 19, 2025 22:46

enable py310 rules

a76115f

style: run ruff autofix

58a5e3b

style: remove unused imports

2f6cd2e

fix ruff errors in tests

ab7789f

onerandomusername added 5 commits October 20, 2025 01:20

fix remaining union errors

d602ba0

fix typed_permissions to use bool | None over optional

0e4a88a

style: update comment in shard.py to match annotation

2f02a8f

docs: add changelog

9d15fbd

revert str | type unions which cause errors on 3.14

1ebea09

onerandomusername force-pushed the qt/py310-typing branch from d08aff0 to 1ebea09 Compare October 20, 2025 05:20

onerandomusername marked this pull request as ready for review October 20, 2025 06:37

onerandomusername requested a review from shiftinv October 20, 2025 16:21

CoderJoshDK mentioned this pull request Oct 20, 2025

style: enable more pyright rules #1441

Draft

8 tasks

shiftinv added t: refactor/typing/lint Refactors, typing changes and/or linting changes skip news labels Oct 21, 2025

onerandomusername mentioned this pull request Oct 21, 2025

refactor(typing): import Callable from collections.abc; reduce usage of Any #1465

Open

8 tasks

shiftinv reviewed Oct 29, 2025

View reviewed changes

		("int \| float", Union[int, float], True), # noqa: UP007
		("int \| float", int \| float, True),

style: enable py3.10 linting rules #1449

Are you sure you want to change the base?

style: enable py3.10 linting rules #1449

Uh oh!

Conversation

onerandomusername commented Oct 20, 2025

Summary

Checklist

Uh oh!

read-the-docs-community bot commented Oct 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Documentation build overview

Uh oh!

onerandomusername commented Oct 20, 2025

Uh oh!

onerandomusername commented Oct 20, 2025

Uh oh!

Enegg commented Oct 20, 2025

Uh oh!

shiftinv Oct 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

onerandomusername Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

shiftinv Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

shiftinv Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

shiftinv Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

shiftinv Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

shiftinv Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

shiftinv Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

read-the-docs-community bot commented Oct 20, 2025 •

edited

Loading

shiftinv Oct 29, 2025 •

edited

Loading