diff --git a/arcade/camera/camera_2d.py b/arcade/camera/camera_2d.py index 2bf94c586..e42ceefa5 100644 --- a/arcade/camera/camera_2d.py +++ b/arcade/camera/camera_2d.py @@ -3,10 +3,9 @@ from collections.abc import Generator from contextlib import contextmanager from math import atan2, cos, degrees, pow, radians, sin -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Self from pyglet.math import Vec2, Vec3 -from typing_extensions import Self from arcade.camera.data_types import ( DEFAULT_FAR, diff --git a/arcade/camera/data_types.py b/arcade/camera/data_types.py index 15b32a29b..4a1742c3a 100644 --- a/arcade/camera/data_types.py +++ b/arcade/camera/data_types.py @@ -6,10 +6,9 @@ from collections.abc import Generator from contextlib import contextmanager -from typing import Final, Protocol +from typing import Final, Protocol, Self from pyglet.math import Vec2, Vec3 -from typing_extensions import Self from arcade.types import LRBT, AsFloat, Point, Point3, Rect diff --git a/arcade/camera/default.py b/arcade/camera/default.py index 690c35cb9..c7b1f194c 100644 --- a/arcade/camera/default.py +++ b/arcade/camera/default.py @@ -2,11 +2,10 @@ from collections.abc import Generator from contextlib import contextmanager -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Self from pyglet.math import Mat4, Vec2, Vec3 from pyglet.window.camera import CameraScissor -from typing_extensions import Self from arcade.camera.data_types import DEFAULT_FAR, DEFAULT_NEAR_ORTHO from arcade.types import Point diff --git a/arcade/camera/orthographic.py b/arcade/camera/orthographic.py index f304253db..6666fa878 100644 --- a/arcade/camera/orthographic.py +++ b/arcade/camera/orthographic.py @@ -2,10 +2,9 @@ from collections.abc import Generator from contextlib import contextmanager -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Self from pyglet.math import Mat4, Vec2, Vec3 -from typing_extensions import Self from arcade.camera.data_types import ( DEFAULT_FAR, diff --git a/arcade/camera/perspective.py b/arcade/camera/perspective.py index f16f75bfc..611699596 100644 --- a/arcade/camera/perspective.py +++ b/arcade/camera/perspective.py @@ -3,10 +3,9 @@ from collections.abc import Generator from contextlib import contextmanager from math import radians, tan -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Self from pyglet.math import Mat4, Vec2, Vec3 -from typing_extensions import Self from arcade.camera.data_types import DEFAULT_FAR, CameraData, PerspectiveProjectionData, Projector from arcade.camera.projection_functions import ( diff --git a/arcade/camera/viewport.py b/arcade/camera/viewport.py index 0f0498bac..cd4f3448d 100644 --- a/arcade/camera/viewport.py +++ b/arcade/camera/viewport.py @@ -2,10 +2,9 @@ from collections.abc import Generator from contextlib import contextmanager -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Self from pyglet.math import Mat4, Vec2, Vec3 -from typing_extensions import Self from arcade.camera.data_types import DEFAULT_FAR, DEFAULT_NEAR_ORTHO from arcade.types import LBWH, Point, Rect diff --git a/arcade/gui/property.py b/arcade/gui/property.py index 4668aba87..367f5dd3a 100644 --- a/arcade/gui/property.py +++ b/arcade/gui/property.py @@ -7,10 +7,10 @@ from contextlib import contextmanager, suppress from enum import Enum from inspect import ismethod -from typing import Any, Generic, TypeVar, cast +from typing import Any, Generic, Self, TypeVar, cast, overload from weakref import WeakKeyDictionary, ref -from typing_extensions import Self, overload, override +from typing_extensions import override P = TypeVar("P") diff --git a/arcade/gui/surface.py b/arcade/gui/surface.py index ecbd65610..f68b4db29 100644 --- a/arcade/gui/surface.py +++ b/arcade/gui/surface.py @@ -2,10 +2,10 @@ from collections.abc import Generator from contextlib import contextmanager from math import radians +from typing import Self from PIL import Image from pyglet.math import Vec2, Vec4 -from typing_extensions import Self import arcade from arcade import Texture diff --git a/arcade/gui/widgets/__init__.py b/arcade/gui/widgets/__init__.py index 2774de4e6..817f34adb 100644 --- a/arcade/gui/widgets/__init__.py +++ b/arcade/gui/widgets/__init__.py @@ -11,7 +11,7 @@ from pyglet.event import EVENT_HANDLED, EVENT_UNHANDLED, EventDispatcher from pyglet.math import Vec2 -from typing_extensions import Self +from typing import Self import arcade from arcade import LBWH, Rect, Sprite, Texture diff --git a/arcade/hitbox/base.py b/arcade/hitbox/base.py index d28265718..3723757d9 100644 --- a/arcade/hitbox/base.py +++ b/arcade/hitbox/base.py @@ -1,10 +1,9 @@ from __future__ import annotations from math import cos, hypot, radians, sin -from typing import Any +from typing import Any, Self from PIL.Image import Image -from typing_extensions import Self from arcade.types import EMPTY_POINT_LIST, Point2, Point2List diff --git a/arcade/types/color.py b/arcade/types/color.py index cce9a512a..ede62327f 100644 --- a/arcade/types/color.py +++ b/arcade/types/color.py @@ -22,9 +22,7 @@ import random from collections.abc import Iterable -from typing import Final, TypeVar - -from typing_extensions import Self +from typing import Final, Self, TypeVar from arcade.exceptions import ByteRangeError, IntOutsideRangeError, NormalizedRangeError diff --git a/pyproject.toml b/pyproject.toml index 03eb82a66..b4cd946a4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -104,7 +104,6 @@ lint.exclude = [ "arcade/examples/*", ] lint.ignore = [ - "UP035", # pending #2985 "E731", # E731 do not assign a lambda expression, use a def "E741", # E741 Ambiguous variable name # F811: redefinition