Move PowerState dataclass to typing.py

pygame-community · Sep 29, 2024 · c8afa8d · c8afa8d
1 parent b429078
commit c8afa8d
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 21 deletions.
diff --git a/buildconfig/stubs/pygame/system.pyi b/buildconfig/stubs/pygame/system.pyi
@@ -1,6 +1,6 @@
 from typing import List, Optional, TypedDict
 
-from pygame._data_classes import PowerState
+from pygame.typing import PowerState
 
 class _InstructionSets(TypedDict):
     ALTIVEC: bool

diff --git a/buildconfig/stubs/pygame/typing.pyi b/buildconfig/stubs/pygame/typing.pyi
@@ -14,7 +14,9 @@ __all__ = [
 
 import sys
 from abc import abstractmethod
-from typing import IO, Callable, Tuple, Union, TypeVar, Protocol
+from dataclasses import dataclass
+from typing import IO, Callable, Tuple, Union, TypeVar, Protocol, Optional
+
 
 if sys.version_info >= (3, 9):
     from os import PathLike as _PathProtocol
@@ -66,5 +68,17 @@ class _HasRectAttribute(Protocol):
 RectLike = Union[SequenceLike[float], SequenceLike[Coordinate], _HasRectAttribute]
 
 
+@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 sys, abstractmethod, IO, Callable, Tuple, Union, TypeVar, Protocol
diff --git a/src_c/system.c b/src_c/system.c
@@ -261,8 +261,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;
     }

diff --git a/src_py/__init__.py b/src_py/__init__.py
@@ -317,7 +317,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

diff --git a/src_py/_data_classes.py b/src_py/_data_classes.py
diff --git a/src_py/meson.build b/src_py/meson.build
@@ -2,7 +2,6 @@
 python_sources = files(
     '__init__.py',
     '_camera_opencv.py',
-    '_data_classes.py',
     '_debug.py',
     '_sprite.py',
     'camera.py',

diff --git a/src_py/typing.py b/src_py/typing.py
@@ -14,7 +14,9 @@
 
 import sys
 from abc import abstractmethod
-from typing import IO, Callable, Tuple, Union, TypeVar, Protocol
+from dataclasses import dataclass
+from typing import IO, Callable, Tuple, Union, TypeVar, Protocol, Optional
+
 
 if sys.version_info >= (3, 9):
     from os import PathLike as _PathProtocol
@@ -66,5 +68,17 @@ def rect(self) -> Union["RectLike", Callable[[], "RectLike"]]: ...
 RectLike = Union[SequenceLike[float], SequenceLike[Coordinate], _HasRectAttribute]
 
 
+@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 sys, abstractmethod, IO, Callable, Tuple, Union, TypeVar, Protocol