Merge pull request #523 from JaskRendix/various

Fix CodeQL findings: empty except blocks, method signature mismatch, unused globals

Author: ppizarror

docs/add_widgets.py

@@ -118,7 +118,7 @@ def func(name):
 elif EXAMPLE == "CLOCK":
     menu = make_menu(pygame_menu.themes.THEME_DARK, "Clock")
 
-    clock = menu.add.clock(font_size=25, font_name=pygame_menu.font.FONT_DIGITAL)
+    menu.add.clock(font_size=25, font_name=pygame_menu.font.FONT_DIGITAL)
 
 elif EXAMPLE == "COLORINPUT":
     menu = make_menu(pygame_menu.themes.THEME_DARK, "Color Entry")
@@ -145,13 +145,13 @@ def func(name):
 elif EXAMPLE == "DROPSELECT":
     menu = make_menu(pygame_menu.themes.THEME_DEFAULT, "Drop Select")
 
-    selector_epic = menu.add.dropselect(
+    menu.add.dropselect(
         title="Is pygame-menu epic?",
         items=[("Yes", 0), ("Absolutely Yes", 1)],
         font_size=16,
         selection_option_font_size=20,
     )
-    selector_sum = menu.add.dropselect(
+    menu.add.dropselect(
         title="What is the value of π?",
         items=[
             ("3 (Engineer)", 0),
@@ -164,7 +164,7 @@ def func(name):
         selection_option_padding=(0, 5),
         selection_option_font_size=20,
     )
-    selector_country = menu.add.dropselect(
+    menu.add.dropselect(
         title="Pick a country",
         items=[
             ("Argentina", "ar"),
@@ -196,7 +196,7 @@ def func(name):
     )
     menu.add.vertical_margin(75)
 
-    selector = menu.add.dropselect_multiple(
+    menu.add.dropselect_multiple(
         title="Pick 3 colors",
         items=[
             ("Black", (0, 0, 0)),
@@ -382,7 +382,7 @@ def open_link(*args) -> None:
         onchange=change_background_color,  # User changes value with left/right keys
     )
     selector.add_self_to_kwargs()  # Callbacks will receive widget as parameter
-    selector2 = menu.add.selector(
+    menu.add.selector(
         title="New color:", items=items, style=pygame_menu.widgets.SELECTOR_STYLE_FANCY
     )
 

pygame_menu/_decorator.py

@@ -1152,6 +1152,7 @@ def _update_pos_list(
         try:
             decoid_exists = self._coord_cache[decoid] is not None
         except KeyError:
+            # No cached coordinates for this decoid; proceed as if unseen
             pass
         if (
             decoid_exists

pygame_menu/widgets/core/widget.py

@@ -280,7 +280,6 @@ class Widget(Base):
     :param kwargs: Optional keyword arguments
     """
 
-    _accept_events: bool
     _alignment: str
     _angle: NumberType
     _args: list[Any]
@@ -361,12 +360,9 @@ class Widget(Base):
     _update_callbacks: dict[
         str, Callable[[EventListType, Widget, pygame_menu.Menu], Any]
     ]
-    _visible: bool
-    active: bool
     configured: bool
     force_menu_draw_focus: bool
     is_scrollable: bool
-    is_selectable: bool
     last_surface: pygame.Surface | None
     lock_position: bool
     readonly: bool
@@ -383,6 +379,9 @@ def __init__(
         onselect: Callable[[bool, Widget, pygame_menu.Menu], Any] | None = None,
         args=None,
         kwargs=None,
+        *,
+        selectable: bool = True,
+        visible: bool = True,
     ) -> None:
         super().__init__(object_id=widget_id)
 
@@ -413,7 +412,7 @@ def __init__(
         self._sound = Sound()
         self._tab_size = 0  # Tab spaces
         self._title = str(title)
-        self._visible = True  # Use show() or hide() to modify this status
+        self._visible = visible  # Use show() or hide() to modify this status
 
         # If True, the widget don't contribute width/height to the Menu widget
         # positioning computation. Use .set_float() to modify this status
@@ -525,7 +524,7 @@ def __init__(
         self.configured = False  # Widget has been configured
         self.force_menu_draw_focus = False  # If True Menu draw focus if widget is selected, don't consider the previous requisites
         self.is_scrollable = False  # Some widgets can be scrolled, such as the Frame
-        self.is_selectable = True  # Some widgets cannot be selected like labels
+        self.is_selectable = selectable  # Some widgets cannot be selected like labels
         self.last_surface = None  # Stores the last surface the widget has been drawn
         self.lock_position = False  # If True, the widget don't update the position if .set_position() is executed
         self.readonly = False  # If True, widget ignores all input

pygame_menu/widgets/widget/colorinput.py

@@ -360,7 +360,7 @@ def value_changed(self) -> bool:
             default = "#" + default
         return self.get_value(as_string=True) != default
 
-    def get_value(self, as_string: bool = False) -> str | Tuple3IntType:
+    def get_value(self, as_string: bool = False) -> str | float | int | Tuple3IntType:
         """
         Return the color value as a tuple or red blue and green channels.
 
@@ -371,7 +371,6 @@ def get_value(self, as_string: bool = False) -> str | Tuple3IntType:
         :param as_string: If ``True`` returns the widget value as plain text
         :return: Color tuple as (R, G, B) or color string
         """
-        assert isinstance(as_string, bool)
         if as_string:
             return self._input_string
 

pygame_menu/widgets/widget/dropselect.py

@@ -223,6 +223,7 @@ def __init__(
         selection_option_font: FontType | None = None,
         selection_option_font_color: ColorInputType = (0, 0, 0),
         selection_option_font_size: int | None = None,
+        selection_option_left_space: bool = False,
         selection_option_left_space_height_factor: float = 1.0,
         selection_option_padding: PaddingType = 5,
         selection_option_selected_bgcolor: ColorInputType = (188, 227, 244),
@@ -328,7 +329,7 @@ def __init__(
 
         # If True adds a space equals to the height of the option at left, used for
         # drawing some options (for example, ticks, boxes, etc.)
-        self._selection_option_left_space = False
+        self._selection_option_left_space = selection_option_left_space
         self._selection_option_left_space_height_factor = (
             selection_option_left_space_height_factor
         )
@@ -1089,7 +1090,7 @@ def _up(self) -> None:
         self._sound.play_key_add()
         return None
 
-    def set_value(self, item: str | int) -> None:
+    def set_value(self, item: str | int, process_index: bool = False) -> None:
         """
         Set the current value of the widget, selecting the item that matches the
         text if ``item`` is a string, or the index if ``item`` is an integer.
@@ -1104,10 +1105,9 @@ def set_value(self, item: str | int) -> None:
 
             This method does not trigger any event (change).
 
-        :param item: Item to select, can be a string or an integer
+        :param item: The item to select, either a string or an integer index.
+        :param process_index: Ignored in this class; used by subclasses.
         """
-        assert isinstance(item, (str, int)), "item must be a string or an integer"
-
         if isinstance(item, str):
             found = False
             for i in self._items:
@@ -1117,13 +1117,17 @@ def set_value(self, item: str | int) -> None:
                     break
             if not found:
                 raise ValueError(f'no value "{item}" found in drop select')
+
         elif isinstance(item, int):
             assert -1 <= item < len(self._items), (
                 "item index must be greater than zero and lower than the number "
                 "of items on the drop select"
             )
             self._index = item
 
+        # Base class ignores process_index
+        # (DropSelectMultiple overrides and uses it)
+
         # Update options background selection
         for b_ind_x in range(len(self._option_buttons)):
             btn = self._option_buttons[b_ind_x]

pygame_menu/widgets/widget/dropselect_multiple.py

@@ -236,6 +236,7 @@ def __init__(
             selection_option_font=selection_option_font,
             selection_option_font_color=selection_option_font_color,
             selection_option_font_size=selection_option_font_size,
+            selection_option_left_space=True,
             selection_option_left_space_height_factor=selection_option_selected_box_height,
             selection_option_padding=selection_option_padding,
             selection_option_selected_bgcolor=selection_option_selected_bgcolor,
@@ -262,7 +263,6 @@ def __init__(
         self._args = args or []
         self._close_on_apply = False
         self._max_selected = max_selected
-        self._selection_option_left_space = True
         self._selection_option_left_space_margin = selection_option_selected_box_margin
 
         # Set style
@@ -490,8 +490,6 @@ def set_value(self, item: str | int, process_index: bool = False) -> None:
         :param item: Item to select, can be a string or an integer
         :param process_index: Adds/Removes the index from the selected indices list
         """
-        assert isinstance(item, (str, int)), "item must be a string or an integer"
-
         if isinstance(item, str):
             found = False
             for i in self._items:

pygame_menu/widgets/widget/frame.py

@@ -161,7 +161,7 @@ def __init__(
         orientation: str,
         frame_id: str = "",
     ) -> None:
-        super().__init__(widget_id=frame_id)
+        super().__init__(widget_id=frame_id, selectable=False)
         assert isinstance(width, NumberInstance)
         assert isinstance(height, NumberInstance)
         assert width > 0, f"width must be greater than zero ({width} received)"
@@ -201,7 +201,6 @@ def __init__(
         self.first_index = -1
         self.horizontal = orientation == ORIENTATION_HORIZONTAL
         self.is_scrollable = False
-        self.is_selectable = False
         self.last_index = -1
 
     def set_title(

pygame_menu/widgets/widget/menubar.py

@@ -135,6 +135,7 @@ def __init__(
             onreturn=onreturn,
             title=title,
             widget_id=menubar_id,
+            selectable=False,
         )
 
         self._backbox = back_box
@@ -157,7 +158,6 @@ def __init__(
         self.set_title(title, offsetx, offsety)
 
         # Public's
-        self.is_selectable = False
         self.fixed = True
 
     def _apply_font(self) -> None:

pygame_menu/widgets/widget/menulink.py

@@ -41,15 +41,12 @@ class MenuLink(NoneWidget):
     def __init__(
         self, menu: pygame_menu.Menu, menu_opener_handler: Callable, link_id: str = ""
     ) -> None:
-        assert isinstance(menu, pygame_menu.Menu)
         assert callable(menu_opener_handler), (
             "menu opener handler must be callable (a function)"
         )
-        super().__init__(widget_id=link_id)
+        super().__init__(widget_id=link_id, visible=False)
         self.menu = menu
         self._onreturn = menu_opener_handler
-        self._visible = False
-        self.is_selectable = False
 
     def hide(self) -> MenuLink:
         pass

pygame_menu/widgets/widget/none.py

@@ -41,9 +41,8 @@ class NoneWidget(Widget):
     :param widget_id: ID of the widget
     """
 
-    def __init__(self, widget_id: str = "") -> None:
-        super().__init__(widget_id=widget_id)
-        self.is_selectable = False
+    def __init__(self, widget_id: str = "", *, visible: bool = True) -> None:
+        super().__init__(widget_id=widget_id, selectable=False, visible=visible)
         self._surface = make_surface(0, 0, alpha=True)
 
     def _apply_font(self) -> None: