Skip to content

Commit 0688823

Browse files
committed
Combine geometry type unions
1 parent d735f3a commit 0688823

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

buildconfig/stubs/pygame/geometry.pyi

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,23 @@ from typing import (
1111
from pygame import Rect, FRect
1212
from pygame.typing import Point, RectLike, SequenceLike
1313

14-
_CanBeCircle = Union[Circle, Tuple[Point, float], SequenceLike[float]]
15-
_CanBeLine = Union[Line, SequenceLike[float], SequenceLike[Point]]
16-
1714
class _HasCircleAttribute(Protocol):
1815
# An object that has a circle attribute that is either a circle, or a function
1916
# that returns a circle
2017
@property
21-
def circle(self) -> Union[_CanBeCircle, Callable[[], _CanBeCircle]]: ...
18+
def circle(self) -> Union[_CircleValue, Callable[[], _CircleValue]]: ...
2219

23-
_CircleValue = Union[_CanBeCircle, _HasCircleAttribute]
20+
_CircleValue = Union[
21+
Circle, Tuple[Point, float], SequenceLike[float], _HasCircleAttribute
22+
]
2423

2524
class _HasLineAttribute(Protocol):
2625
# An object that has a line attribute that is either a line, or a function
2726
# that returns a line
2827
@property
29-
def line(self) -> Union[_CanBeLine, Callable[[], _CanBeLine]]: ...
28+
def line(self) -> Union[_LineValue, Callable[[], _LineValue]]: ...
3029

31-
_LineValue = Union[_CanBeLine, _HasLineAttribute]
30+
_LineValue = Union[Line, SequenceLike[float], SequenceLike[Point], _HasLineAttribute]
3231

3332
_CanBeCollided = Union[Circle, Rect, FRect, Point]
3433
_CanBeIntersected = Union[Circle]

0 commit comments

Comments
 (0)