Improve typing and consistent returns

Author: ppizarror

README.rst

@@ -14,9 +14,9 @@ pygame-menu-ce
     :target: https://opensource.org/licenses/MIT
     :alt: License MIT
 
-.. image:: https://img.shields.io/badge/python-3.7+-red.svg
+.. image:: https://img.shields.io/badge/python-3.8+-red.svg
     :target: https://www.python.org/downloads
-    :alt: Python 3.7+
+    :alt: Python 3.8+
 
 .. image:: https://badge.fury.io/py/pygame-menu.svg
     :target: https://pypi.org/project/pygame-menu

build.py

@@ -11,7 +11,7 @@
 import sys
 
 assert len(sys.argv) == 2, 'Argument is required, usage: build.py pip/twine'
-mode = sys.argv[1].strip()
+mode: str = sys.argv[1].strip()
 
 if mode == 'pip':
     if os.path.isdir('dist'):

pygame_menu/_decorator.py

@@ -28,26 +28,26 @@
     CallableNoArgsType
 
 # Decoration constants
-DECORATION_ARC = 2000
-DECORATION_BASEIMAGE = 2001
-DECORATION_BEZIER = 2002
-DECORATION_CALLABLE = 2003
-DECORATION_CALLABLE_NO_ARGS = 2015
-DECORATION_CIRCLE = 2004
-DECORATION_ELLIPSE = 2005
-DECORATION_FILL = 2020
-DECORATION_LINE = 2006
-DECORATION_NONE = 2007
-DECORATION_PIE = 2008
-DECORATION_PIXEL = 209
-DECORATION_POLYGON = 2010
-DECORATION_RECT = 2011
-DECORATION_SURFACE = 2012
-DECORATION_TEXT = 2013
-DECORATION_TEXTURE_POLYGON = 2014
-
-DECOR_TYPE_PREV = 'prev'
-DECOR_TYPE_POST = 'post'
+DECORATION_ARC: int = 2000
+DECORATION_BASEIMAGE: int = 2001
+DECORATION_BEZIER: int = 2002
+DECORATION_CALLABLE: int = 2003
+DECORATION_CALLABLE_NO_ARGS: int = 2015
+DECORATION_CIRCLE: int = 2004
+DECORATION_ELLIPSE: int = 2005
+DECORATION_FILL: int = 2020
+DECORATION_LINE: int = 2006
+DECORATION_NONE: int = 2007
+DECORATION_PIE: int = 2008
+DECORATION_PIXEL: int = 209
+DECORATION_POLYGON: int = 2010
+DECORATION_RECT: int = 2011
+DECORATION_SURFACE: int = 2012
+DECORATION_TEXT: int = 2013
+DECORATION_TEXTURE_POLYGON: int = 2014
+
+DECOR_TYPE_PREV: str = 'prev'
+DECOR_TYPE_POST: str = 'post'
 
 
 # noinspection PyProtectedMember
@@ -956,7 +956,6 @@ def draw_post(self, surface: 'pygame.Surface') -> 'Decorator':
             self._draw_assemble_cache(DECOR_TYPE_POST, self._decor[DECOR_TYPE_POST], surface)
         return self
 
-    # noinspection PyArgumentList
     def _draw(self, deco: List[Tuple[int, str, Any]], surface: 'pygame.Surface') -> None:
         """
         Draw.

pygame_menu/_scrollarea.py

@@ -496,7 +496,6 @@ def draw(self, surface: 'pygame.Surface') -> 'ScrollArea':
             surface.blit(self._bg_surface, (self._rect.x - self._extend_x, self._rect.y - self._extend_y))
 
         # Draw world surface
-        # noinspection PyTypeChecker
         surface.blit(self._world, self._view_rect.topleft, (self.get_offsets(), self._view_rect.size))
 
         # Then draw scrollbars
@@ -923,7 +922,6 @@ def scroll_to(self, orientation: str, value: NumberType) -> 'ScrollArea':
                 break
         return self
 
-    # noinspection PyTypeChecker
     def scroll_to_rect(
         self,
         rect: 'pygame.Rect',

pygame_menu/baseimage.py

@@ -554,7 +554,6 @@ def apply_image_function(
                 g = int(max(0, min(g, 255)))
                 b = int(max(0, min(b, 255)))
                 a = int(max(0, min(a, 255)))
-                # noinspection PyArgumentList
                 self.set_at((x, y), pygame.Color(r, g, b, a))
         return self
 
@@ -605,7 +604,6 @@ def pick_channels(self, channels: ChannelType) -> 'BaseImage':
                     g = 0
                 if 'b' not in channels:
                     b = 0
-                # noinspection PyArgumentList
                 self._surface.set_at((x, y), pygame.Color(r, g, b, a))
         return self
 

pygame_menu/controls.py

@@ -36,26 +36,25 @@
 ]
 
 # Imports
-# noinspection PyUnresolvedReferences
-import pygame_menu
 import pygame.locals as _locals
 from pygame.event import Event as EventType
+from pygame_menu._types import Tuple2IntType
 from typing import Union
 
-WidgetType = Union['pygame_menu.Menu', 'pygame_menu.widgets.Widget']
+WidgetType = Union['pygame_menu.Menu', 'pygame_menu.widgets.Widget']  # type: ignore
 
 # Joy pad
-JOY_AXIS_X = 0
-JOY_AXIS_Y = 1
-JOY_BUTTON_BACK = 1
-JOY_BUTTON_SELECT = 0
-JOY_DEADZONE = 0.5
-JOY_DELAY = 300  # ms
-JOY_DOWN = (0, -1)
-JOY_LEFT = (-1, 0)
-JOY_REPEAT = 100  # ms
-JOY_RIGHT = (1, 0)
-JOY_UP = (0, 1)
+JOY_AXIS_X: int = 0
+JOY_AXIS_Y: int = 1
+JOY_BUTTON_BACK: int = 1
+JOY_BUTTON_SELECT: int = 0
+JOY_DEADZONE: float = 0.5
+JOY_DELAY: int = 300  # ms
+JOY_DOWN: Tuple2IntType = (0, -1)
+JOY_LEFT: Tuple2IntType = (-1, 0)
+JOY_REPEAT: int = 100  # ms
+JOY_RIGHT: Tuple2IntType = (1, 0)
+JOY_UP: Tuple2IntType = (0, 1)
 
 # Keyboard events
 KEY_APPLY = _locals.K_RETURN

pygame_menu/examples/other/calculator.py

@@ -144,7 +144,6 @@ def process_events(self, events: List['pygame.event.Event'], _=None) -> None:
         """
         for event in events:
             if event.type == pygame.KEYDOWN:
-                # noinspection PyUnresolvedReferences
                 if event.key == pygame.K_0:
                     self._press(0)
                 elif event.key == pygame.K_1:

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/examples/other/scrollbar.py

@@ -36,10 +36,8 @@ def make_world(width: int, height: int) -> 'pygame.Surface':
         for y in range(100, height, 200):
             if number_x in (0, max_x - 1) or number_y in (0, max_y - 1):
                 # White circles to delimit world boundaries
-                # noinspection PyArgumentList
                 pygame.draw.circle(world, (255, 255, 255), (x, y), 100, 10)
             else:
-                # noinspection PyArgumentList
                 pygame.draw.circle(world, color, (x, y), 100, 10)
                 if color[0] + 15 < 255:
                     color[0] += 15

pygame_menu/font.py

@@ -124,7 +124,6 @@ def get_font(name: FontType, size: int) -> '__font.Font':
                 most_similar = 0
                 most_similar_index = 0
                 for i in range(len(system_fonts)):
-                    # noinspection PyArgumentEqualDefault
                     sim = SequenceMatcher(None, system_fonts[i], font_name).ratio()
                     if sim > most_similar:
                         most_similar = sim