Merge pull request #87 from monkeyman192/small_typing_changes

small typing fixes

Author: monkeyman192

docs/docs/change_log.rst

@@ -1,7 +1,7 @@
 Change Log
 ==========
 
-Current (0.1.17.dev)
+Current (0.2.0.dev)
 --------------------
 
 - Further improved partial structs to allow nesting references to themselves as a type (must be "indirect", ie. the type of a pointer, or dynamic array for example).

pymhf/extensions/ctypes.py

@@ -16,6 +16,10 @@ class c_enum32(ctypes.c_int32, Generic[IE]):
 
     _enum_type: Type[IE]
 
+    @classmethod
+    def _members(cls):
+        return list(cls._enum_type.__members__.keys())
+
     @property
     def _enum_value(self) -> IE:
         return self._enum_type(self.value)

pymhf/gui/gui.py

@@ -37,7 +37,7 @@ class WidgetType(Enum):
 
 class Widgets(TypedDict):
     buttons: dict[str, Union[int, str]]
-    comboboxes: dict[str, Union[int, str]]
+    comboboxes: dict[str, list[tuple[Union[int, str], WidgetType]]]
     variables: dict[str, list[tuple[Union[int, str], WidgetType]]]
 
 

tests/unit/test_c_enums.py

@@ -0,0 +1,21 @@
+from enum import IntEnum
+
+import pytest
+
+from pymhf.extensions.ctypes import c_enum32
+
+
+def test_invalid_c_enum32_cases():
+    with pytest.raises(TypeError):
+        c_enum32[22]
+
+
+def test_c_enum_members():
+    class Alphabet(IntEnum):
+        A = 0
+        B = 1
+        C = 2
+        D = 3
+        E = 4
+
+    assert c_enum32[Alphabet]._members() == ["A", "B", "C", "D", "E"]

tests/unit/test_partial_structs.py

@@ -403,11 +403,6 @@ class Test4(ctypes.Structure):
             a: Annotated[ctypes.c_int32, "hi"]
 
 
-def test_invalid_c_enum32_cases():
-    with pytest.raises(TypeError):
-        c_enum32[22]
-
-
 T = TypeVar("T", bound=Union[ctypes._SimpleCData, ctypes.Structure])