Improve typing

Author: ppizarror

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/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

pygame_menu/sound.py

@@ -181,7 +181,7 @@ def __init__(
             # noinspection PyBroadException
             try:
                 # pygame < 1.9.5
-                mixer_kwargs = {
+                mixer_kwargs: Dict[str, Union[int, str]] = {
                     'frequency': frequency,
                     'size': size,
                     'channels': channels,
@@ -275,7 +275,6 @@ def get_channel(self) -> 'mixer.Channel':
 
         :return: Sound engine channel
         """
-        # noinspection PyArgumentList
         channel = mixer.find_channel()  # force only available on pygame v2
         if self._uniquechannel:  # If the channel is unique
             if self._channel is None:  # If the channel has not been set
@@ -331,7 +330,6 @@ def set_sound(
 
         # Load the sound
         try:
-            # noinspection PyTypeChecker
             sound_data = mixer.Sound(file=sound_file)
         except pygame_error:
             if self._verbose:

pygame_menu/utils.py

@@ -271,21 +271,22 @@ def fill_gradient(
     if vertical:
         for line in range(y1, y2):
             color = (
-                min(max(a[0] + (rate[0] * (line - y1)), 0), 255),
-                min(max(a[1] + (rate[1] * (line - y1)), 0), 255),
-                min(max(a[2] + (rate[2] * (line - y1)), 0), 255)
+                int(min(max(a[0] + (rate[0] * (line - y1)), 0), 255)),
+                int(min(max(a[1] + (rate[1] * (line - y1)), 0), 255)),
+                int(min(max(a[2] + (rate[2] * (line - y1)), 0), 255))
             )
             fn_line(surface, color, (x1, line), (x2, line))
     else:
         for col in range(x1, x2):
             color = (
-                min(max(a[0] + (rate[0] * (col - x1)), 0), 255),
-                min(max(a[1] + (rate[1] * (col - x1)), 0), 255),
-                min(max(a[2] + (rate[2] * (col - x1)), 0), 255)
+                int(min(max(a[0] + (rate[0] * (col - x1)), 0), 255)),
+                int(min(max(a[1] + (rate[1] * (col - x1)), 0), 255)),
+                int(min(max(a[2] + (rate[2] * (col - x1)), 0), 255))
             )
             fn_line(surface, color, (col, y1), (col, y2))
 
 
+# noinspection PyUnusedLocal
 def format_color(
     color: Union[ColorInputType, Any],
     warn_if_invalid: bool = True
@@ -401,15 +402,13 @@ def load_pygame_image_file(image_path: str, **kwargs) -> 'pygame.Surface':
 
                 pil_invalid_exception = UnidentifiedImageError
                 img_pil = Image.open(image_path)
-                # noinspection PyTypeChecker
+                # noinspection PyTypeChecker,PyUnusedLocal
                 surface = pygame.image.fromstring(
                     img_pil.tobytes(), img_pil.size, img_pil.mode).convert()
-
             except (ModuleNotFoundError, ImportError):
                 warn(f'Image file "{image_path}" could not be loaded, as pygame.error '
                      f'is raised. To avoid this issue install the Pillow library')
                 raise
-
             except pil_invalid_exception:
                 warn(f'The image "{image_path}" could not be loaded using Pillow')
                 raise
@@ -442,7 +441,6 @@ def make_surface(
         'surface width and height must be equal or greater than zero'
     surface = pygame.Surface((int(width), int(height)), pygame.SRCALPHA, 32)
     if alpha and _ALPHA_CHANNEL[0]:
-        # noinspection PyArgumentList
         surface = pygame.Surface.convert_alpha(surface)
     if fill_color is not None:
         fill_color = assert_color(fill_color)
@@ -602,7 +600,6 @@ def set_pygame_cursor(cursor: CursorInputType) -> None:  # type: ignore
     """
     try:
         if cursor is not None:
-            # noinspection PyArgumentList
             pygame.mouse.set_cursor(cursor)
     except (pygame.error, TypeError):
         if PYGAME_V2:

pygame_menu/widgets/selection/highlight.py

@@ -55,7 +55,6 @@ def __init__(
     def draw(self, surface: 'pygame.Surface', widget: 'pygame_menu.widgets.Widget') -> 'HighlightSelection':
         if self._border_width == 0:
             return self
-        # noinspection PyArgumentList
         pygame.draw.rect(
             surface,
             self.color,

pygame_menu/widgets/widget/frame.py

@@ -506,7 +506,6 @@ def add_title_button(
 
         # Draw style
         style_surface = make_surface(h, h, alpha=True)
-        # noinspection PyArgumentList
         pygame.draw.polygon(style_surface, symbol_color, style_pos, border)
         btn.get_decorator().add_surface(0, 0, surface=style_surface, centered=True)
 

pygame_menu/widgets/widget/menubar.py

@@ -250,7 +250,6 @@ def _draw(self, surface: 'pygame.Surface') -> None:
 
         # Draw backbox if enabled
         if self._backbox_visible():
-            # noinspection PyArgumentList
             pygame.draw.rect(surface, self._backbox_background_color, self._backbox_rect, self._backbox_border_width)
             pygame.draw.polygon(surface, self._backbox_background_color, self._backbox_pos)