Improve implicit returns

Author: ppizarror

pygame_menu/examples/other/maze.py

@@ -1027,7 +1027,6 @@ def _update_square(self, row: int, column: int) -> None:
         :param column: Column number
         :return:
         """
-        # noinspection PyArgumentList
         pygame.display.update(
             (self._margin + self._width) * column + self._margin + self._offset[0],
             (self._margin + self._height) * row + self._margin + self._offset[1],
@@ -1234,6 +1233,8 @@ def _xfs(self, mazearray: _MazeType, start_point: _Point2, goal_node: _Point2, x
                 current_node = mydeque.pop()
             elif x == 'b':
                 current_node = mydeque.popleft()
+            else:
+                return False
 
             # noinspection PyUnboundLocalVariable
             if current_node == goal_node:
@@ -1248,10 +1249,10 @@ def _xfs(self, mazearray: _MazeType, start_point: _Point2, goal_node: _Point2, x
                     if path_node == start_point:
                         return True
 
-            if mazearray[current_node[0]][current_node[1]].nodetype == 'wall':
+            elif mazearray[current_node[0]][current_node[1]].nodetype == 'wall':
                 continue
 
-            if current_node not in visited_nodes:
+            elif current_node not in visited_nodes:
                 visited_nodes.add(current_node)
                 mazearray[current_node[0]][current_node[1]].update(is_visited=True)
                 self._draw_square(mazearray, current_node[0], current_node[1])

pygame_menu/widgets/core/widget.py

@@ -233,7 +233,7 @@ class Widget(Base):
     _check_mouseleave_call_render: bool
     _col_row_index: Tuple3IntType
     _ctrl: 'Controller'
-    _cursor: CursorType
+    _cursor: CursorType  # type: ignore
     _decorator: 'Decorator'
     _default_value: Any
     _draw_callbacks: Dict[str, Callable[['Widget', Optional['pygame_menu.Menu']], Any]]
@@ -1255,14 +1255,15 @@ def apply(self, *args) -> Any:
         """
         self.scroll_to_widget(scroll_parent=False)
         if self.readonly:
-            return
+            return None
         elif self._onreturn:
             args = list(args) + list(self._args)
             try:
                 args.insert(0, self.get_value())
             except ValueError:
                 pass
             return self._onreturn(*args, **self._kwargs)
+        return None
 
     def change(self, *args) -> Any:
         """
@@ -3137,7 +3138,7 @@ def _get_status(self) -> Tuple[Any, ...]:
         )
 
         # Starting data
-        data = [cls_name, geom, bool_status]
+        data: List[Any] = [cls_name, geom, bool_status]
 
         # Append inner widgets if frame and not menu
         if isinstance(self, pygame_menu.widgets.Frame):

pygame_menu/widgets/widget/dropselect.py

@@ -117,7 +117,7 @@ class DropSelect(Widget):
     _placeholder: str
     _placeholder_add_to_selection_box: bool
     _scrollbar_color: ColorType
-    _scrollbar_cursor: CursorType
+    _scrollbar_cursor: CursorType  # type: ignore
     _scrollbar_shadow: bool
     _scrollbar_shadow_color: ColorType
     _scrollbar_shadow_offset: int
@@ -140,7 +140,7 @@ class DropSelect(Widget):
     _selection_infinite: bool
     _selection_option_border_color: ColorType
     _selection_option_border_width: int
-    _selection_option_cursor: CursorType
+    _selection_option_cursor: CursorType  # type: ignore
     _selection_option_font_style: Dict[str, Any]
     _selection_option_left_space: bool
     _selection_option_left_space_height_factor: float
@@ -873,9 +873,9 @@ def _down(self) -> None:
         Move current selection down.
         """
         if self.readonly:
-            return
+            return None
         elif len(self._items) == 0:
-            return
+            return None
         elif not self.active:
             return self._toggle_drop()
         elif self._index == -1:
@@ -887,19 +887,20 @@ def _down(self) -> None:
                 prev = self._index
                 new = max(0, self._index - 1)
                 if prev == new:
-                    return
+                    return None
                 self.set_value(new)
         self.change(*self._items[self._index][1:])
         self._sound.play_key_add()
+        return None
 
     def _up(self) -> None:
         """
         Move current selection up.
         """
         if self.readonly:
-            return
+            return None
         elif len(self._items) == 0:
-            return
+            return None
         elif not self.active:
             return self._toggle_drop()
         elif self._index == -1:
@@ -911,10 +912,11 @@ def _up(self) -> None:
                 prev = self._index
                 new = min(self._index + 1, len(self._items) - 1)
                 if prev == new:
-                    return
+                    return None
                 self.set_value(new)
         self.change(*self._items[self._index][1:])
         self._sound.play_key_add()
+        return None
 
     def set_value(self, item: Union[str, int]) -> None:
         """

pygame_menu/widgets/widget/image.py

@@ -167,6 +167,7 @@ def _render(self) -> Optional[bool]:
         if not self._render_hash_changed(self._visible):
             return True
         self.force_menu_surface_update()
+        return None
 
     def update(self, events: EventVectorType) -> bool:
         self.apply_update_callbacks(events)

pygame_menu/widgets/widget/label.py

@@ -332,6 +332,7 @@ def _render(self) -> Optional[bool]:
                     )
 
         self.force_menu_surface_update()
+        return None
 
     def update(self, events: EventVectorType) -> bool:
         # If generator is not None

pygame_menu/widgets/widget/progressbar.py

@@ -268,6 +268,7 @@ def _render(self) -> Optional[bool]:
 
         # Finals
         self.force_menu_surface_update()
+        return None
 
     def update(self, events: EventVectorType) -> bool:
         self.apply_update_callbacks(events)

pygame_menu/widgets/widget/rangeslider.py

@@ -786,6 +786,7 @@ def _render(self) -> Optional[bool]:
 
         # Finals
         self.force_menu_surface_update()
+        return None
 
     def _get_pos_range(self, value: NumberType, surface: Optional['pygame.Surface'] = None) -> int:
         """

pygame_menu/widgets/widget/selector.py

@@ -320,6 +320,7 @@ def _render(self) -> Optional[bool]:
         self._apply_transforms()
         self._rect.width, self._rect.height = self._surface.get_size()
         self.force_menu_surface_update()
+        return None
 
     def get_index(self) -> int:
         """

pygame_menu/widgets/widget/textinput.py

@@ -530,6 +530,7 @@ def _render(self) -> Optional[bool]:
 
         # Force Menu update
         self.force_menu_surface_update()
+        return None
 
     def _render_selection_box(self, force: bool = False) -> None:
         """
@@ -1559,7 +1560,6 @@ def update(self, events: EventVectorType) -> bool:
         self._clock.tick(60)
 
         # Check mouse pressed
-        # noinspection PyArgumentList
         mouse_left, mouse_middle, mouse_right = pygame.mouse.get_pressed()
         self._mouse_is_pressed = (mouse_left or mouse_right or mouse_middle) and self._mouse_enabled
 
@@ -1609,7 +1609,6 @@ def update(self, events: EventVectorType) -> bool:
                 if any(pygame.key.get_mods() & mod == mod for mod in CTRL_KMOD):
                     # If test, disable CTRL
                     if 'test' in event.dict and event.dict['test']:
-                        # noinspection PyArgumentList
                         pygame.key.set_mods(pygame.KMOD_NONE)
 
                     # Ctrl+C copy

pygame_menu/widgets/widget/toggleswitch.py

@@ -349,6 +349,7 @@ def _render(self) -> Optional[bool]:
 
         # Finals
         self.force_menu_surface_update()
+        return None
 
     def _left(self) -> None:
         """