Improve if/elif on return

Author: ppizarror

pygame_menu/_scrollarea.py

@@ -592,7 +592,7 @@ def get_border_size(self) -> Tuple2IntType:
         if isinstance(self._border_color, pygame_menu.BaseImage):  # Image
             return self._border_tiles_size
         # Color
-        if self._border_color is None:
+        elif self._border_color is None:
             return 0, 0
         return self._border_width, self._border_width
 
@@ -658,15 +658,13 @@ def get_scrollbar_thickness(self, orientation: str, visible: bool = True) -> int
         """
         assert_orientation(orientation)
         assert isinstance(visible, bool)
-
         if visible:
             total = 0
             for sbar in self._scrollbars:
                 if sbar.get_orientation() == orientation and sbar.is_visible():
                     total += sbar.get_thickness()
             return total
-
-        if orientation == ORIENTATION_HORIZONTAL:
+        elif orientation == ORIENTATION_HORIZONTAL:
             return int(self._rect.height - self._view_rect.height)
         elif orientation == ORIENTATION_VERTICAL:
             return int(self._rect.width - self._view_rect.width)
@@ -702,7 +700,7 @@ def get_view_rect(self) -> 'pygame.Rect':
             return rect
 
         # All scrollbars: the world is too large
-        if self._world.get_height() > self._rect.height and self._world.get_width() > self._rect.width:
+        elif self._world.get_height() > self._rect.height and self._world.get_width() > self._rect.width:
             for sbar in self._scrollbars:
                 if not sbar.is_visible():
                     continue

pygame_menu/baseimage.py

@@ -652,7 +652,7 @@ def scale(
         w, h = self.get_size()
         if width == 1 and height == 1:
             return self
-        if not smooth or self._surface.get_bitsize() < 24:
+        elif not smooth or self._surface.get_bitsize() < 24:
             self._surface = pygame.transform.scale(self._surface, (int(w * width), int(h * height)))
         else:  # image bitsize less than 24 bits raises ValueError
             self._surface = pygame.transform.smoothscale(self._surface, (int(w * width), int(h * height)))
@@ -749,7 +749,7 @@ def rotate(self, angle: NumberType, auto_checkpoint: bool = True) -> 'BaseImage'
         assert isinstance(angle, NumberInstance)
         if angle == self._angle:
             return self
-        if not self._rotated and auto_checkpoint:
+        elif not self._rotated and auto_checkpoint:
             self.checkpoint()
         if self._rotated:
             self.restore()

pygame_menu/examples/other/maze.py

@@ -1082,9 +1082,8 @@ def _dijkstra(
             if current_node in visited_nodes:
                 if len(queue.show()) == 0:
                     return False
-                else:
-                    priority, current_distance, current_node = queue.pop()
-                    continue
+                _, current_distance, current_node = queue.pop()
+                continue
 
             # Call to check neighbours of the current node
             for neighbour in self._get_neighbours(current_node, n):

pygame_menu/menu.py

@@ -1096,7 +1096,7 @@ def select_widget(self, widget: Optional[Union['Widget', str]]) -> 'Menu':
                 w.select(False)
             self._index = -1
             return self
-        if isinstance(widget, str):
+        elif isinstance(widget, str):
             widget = self.get_widget(widget)
         assert isinstance(widget, Widget)
         if not widget.is_selectable:
@@ -3669,7 +3669,7 @@ def _remove_submenu(
                 del self._submenus[menu]
             self._update_after_remove_or_hidden(self._index)
             return True
-        if recursive:
+        elif recursive:
             for sm in self._submenus:
                 if sm._remove_submenu(menu, hook, recursive):
                     return True

pygame_menu/widgets/core/widget.py

@@ -601,7 +601,7 @@ def mouseover(
                     while True:
                         if len(prev) == 0:
                             break
-                        if prev[0] == self._frame:
+                        elif prev[0] == self._frame:
                             in_prev = True
                             break
                         prev = prev[2]
@@ -689,7 +689,7 @@ def _check_mouseover(
             return False
 
         # If mouse out from window
-        if event.type == pygame.ACTIVEEVENT and hasattr(event, 'gain'):
+        elif event.type == pygame.ACTIVEEVENT and hasattr(event, 'gain'):
             if event.gain == 1:
                 return False
             # Mouse is outside window
@@ -1702,7 +1702,6 @@ def _font_render_string(
 
         # Replace tabs
         text = text.replace('\t', ' ' * self._tab_size)
-
         surface = self._font.render(text, self._font_antialias, color, bgcolor)
         return surface
 
@@ -2028,9 +2027,6 @@ def _set_position_relative_to_frame(self, index: int = -1) -> 'Widget':
             c, r, _ = self._frame.get_col_row_index()
             self.set_col_row_index(c, r, index)
             self._frame.update_indices()
-        else:
-            # raise ValueError(f'{self.get_class_id()} is not within a frame')
-            pass
         return self
 
     def set_position(self, x: NumberType, y: NumberType) -> 'Widget':
@@ -3124,6 +3120,7 @@ def _get_status(self) -> Tuple[Any, ...]:
                     data.append(ww._get_status())
 
         # Append inner widgets if drop select
+        # noinspection PyUnresolvedReferences
         if (isinstance(self, pygame_menu.widgets.DropSelect) and
             hasattr(self, '_drop_frame') and
             self._drop_frame is not None and

pygame_menu/widgets/widget/dropselect_multiple.py

@@ -148,7 +148,7 @@ def __init__(
         placeholder_add_to_selection_box: bool = True,
         placeholder_selected: str = '{0} selected',
         scrollbar_color: ColorInputType = (235, 235, 235),
-        scrollbar_cursor: CursorInputType = None,
+        scrollbar_cursor: CursorInputType = None,  # type: ignore
         scrollbar_shadow: bool = False,
         scrollbar_shadow_color: ColorInputType = (0, 0, 0),
         scrollbar_shadow_offset: int = 2,
@@ -173,7 +173,7 @@ def __init__(
         selection_option_active_font_color: ColorInputType = (0, 0, 0),
         selection_option_border_color: ColorInputType = (220, 220, 220),
         selection_option_border_width: int = 1,
-        selection_option_cursor: CursorInputType = None,
+        selection_option_cursor: CursorInputType = None,  # type: ignore
         selection_option_font: Optional[FontType] = None,
         selection_option_font_color: ColorInputType = (0, 0, 0),
         selection_option_font_size: Optional[int] = None,
@@ -337,7 +337,7 @@ def _get_current_selected_text(self) -> str:
                 f'string (List[str]=>str), not {type(o)} type ({o} returned)'
             return self._placeholder_selected.format(o)
 
-        raise ValueError('invalid selection placeholder format type')
+        raise ValueError(f'invalid selection placeholder format type "{self._selection_placeholder_format}"')
 
     def _get_selected_items_list_str(self) -> List[str]:
         """

pygame_menu/widgets/widget/menubar.py

@@ -270,13 +270,13 @@ def get_scrollbar_style_change(self, position: str) -> Tuple[int, Tuple2IntType]
         self._render()
         if not self._modify_scrollarea or not self.is_visible():
             return 0, (0, 0)
-        if not self.fixed or self.is_floating():
+        elif not self.fixed or self.is_floating():
             if self._style == MENUBAR_STYLE_ADAPTIVE:
                 if position == POSITION_EAST:
                     t = self._polygon_pos[4][1] - self._polygon_pos[2][1]
                     return t, (0, -t)
             return 0, (0, 0)
-        if position == POSITION_NORTH:
+        elif position == POSITION_NORTH:
             return self._scrollbar_deltas[0]
         elif position == POSITION_EAST:
             return self._scrollbar_deltas[1]
@@ -298,7 +298,7 @@ def _render(self) -> Optional[bool]:
             return True
 
         # Update box mode
-        if menu_prev_condition:
+        elif menu_prev_condition:
             self._box_mode = _MODE_CLOSE
         else:
             self._box_mode = _MODE_BACK

pygame_menu/widgets/widget/progressbar.py

@@ -229,7 +229,7 @@ def _render(self) -> Optional[bool]:
         if not hasattr(self, '_progress_font'):
             return False
 
-        if not self._render_hash_changed(self._selected, self._title, self._visible, self.readonly, self._progress):
+        elif not self._render_hash_changed(self._selected, self._title, self._visible, self.readonly, self._progress):
             return True
 
         # Create basic title

pygame_menu/widgets/widget/rangeslider.py

@@ -654,9 +654,9 @@ def _render(self) -> Optional[bool]:
         if not hasattr(self, '_font_range_value'):
             return False
 
-        if not self._render_hash_changed(self._selected, self._title, self._visible, self.readonly,
-                                         self._range_values, self._slider_selected, self._value[0],
-                                         self._value[1], self._scrolling, self._selected_mouse):
+        elif not self._render_hash_changed(self._selected, self._title, self._visible, self.readonly,
+                                           self._range_values, self._slider_selected, self._value[0],
+                                           self._value[1], self._scrolling, self._selected_mouse):
             return True
 
         # Create basic title

pygame_menu/widgets/widget/scrollbar.py

@@ -300,9 +300,9 @@ def _render(self) -> Optional[bool]:
         if self._slider_rect is None:
             return
 
-        if not self._render_hash_changed(width, height, self._slider_rect.x, self._slider_rect.y,
-                                         self.readonly, self._slider_rect.width, self._slider_rect.height,
-                                         self.scrolling, self._mouseover, self._clicked):
+        elif not self._render_hash_changed(width, height, self._slider_rect.x, self._slider_rect.y,
+                                           self.readonly, self._slider_rect.width, self._slider_rect.height,
+                                           self.scrolling, self._mouseover, self._clicked):
             return True
 
         self._surface = make_surface(width, height)