Move PowerState dataclass to typing.py

Author: ankith26

buildconfig/stubs/pygame/system.pyi

@@ -5,7 +5,7 @@
 
 from typing import Optional, TypedDict
 
-from pygame._data_classes import PowerState
+from pygame.typing import PowerState
 
 class _InstructionSets(TypedDict):
     ALTIVEC: bool

buildconfig/stubs/pygame/typing.pyi

@@ -14,8 +14,9 @@ __all__ = [
 
 from abc import abstractmethod
 from collections.abc import Callable
+from dataclasses import dataclass
 from os import PathLike as _PathProtocol
-from typing import IO, Protocol, TypeVar, Union
+from typing import IO, Protocol, TypeVar, Union, Optional
 
 from pygame.color import Color
 from pygame.rect import FRect, Rect
@@ -62,6 +63,18 @@ RectLike = Union[
 ]
 
 
+@dataclass(frozen=True)
+class PowerState:
+    battery_percent: Optional[int]
+    battery_seconds: Optional[int]
+    on_battery: bool
+    no_battery: bool
+    charging: bool
+    charged: bool
+    plugged_in: bool
+    has_battery: bool
+
+
 # cleanup namespace
 del (
     abstractmethod,
@@ -73,4 +86,6 @@ del (
     Union,
     TypeVar,
     Protocol,
+    Optional,
+    dataclass,
 )

src_c/system.c

@@ -283,8 +283,7 @@ MODINIT_DEFINE(system)
         return NULL;
     }
 
-    PyObject *data_classes_module =
-        PyImport_ImportModule("pygame._data_classes");
+    PyObject *data_classes_module = PyImport_ImportModule("pygame.typing");
     if (!data_classes_module) {
         return NULL;
     }

src_py/__init__.py

@@ -330,7 +330,7 @@ def PixelArray(surface):  # pylint: disable=unused-argument
 
 try:
     import pygame.system
-    from pygame._data_classes import PowerState as power_state
+    from pygame.typing import PowerState as power_state
 
     power_state.__module__ = "pygame.system"
     del power_state

src_py/_data_classes.py

@@ -2,7 +2,6 @@
 python_sources = files(
     '__init__.py',
     '_camera_opencv.py',
-    '_data_classes.py',
     '_debug.py',
     '_sprite.py',
     'camera.py',

src_py/meson.build

@@ -14,8 +14,9 @@
 
 from abc import abstractmethod
 from collections.abc import Callable
+from dataclasses import dataclass
 from os import PathLike as _PathProtocol
-from typing import IO, Protocol, TypeVar, Union
+from typing import IO, Protocol, TypeVar, Union, Optional
 
 from pygame.color import Color
 from pygame.rect import FRect, Rect
@@ -62,6 +63,18 @@ def rect(self) -> Union["RectLike", Callable[[], "RectLike"]]: ...
 ]
 
 
+@dataclass(frozen=True)
+class PowerState:
+    battery_percent: Optional[int]
+    battery_seconds: Optional[int]
+    on_battery: bool
+    no_battery: bool
+    charging: bool
+    charged: bool
+    plugged_in: bool
+    has_battery: bool
+
+
 # cleanup namespace
 del (
     abstractmethod,
@@ -73,4 +86,6 @@ def rect(self) -> Union["RectLike", Callable[[], "RectLike"]]: ...
     Union,
     TypeVar,
     Protocol,
+    Optional,
+    dataclass,
 )