More fixes from flake8 and mypy

Author: MyreMylar

pygame_gui/__init__.py

@@ -48,7 +48,7 @@
 from pygame_gui._constants import TEXT_EFFECT_SHAKE
 from pygame_gui._constants import TEXT_EFFECT_EXPAND_CONTRACT
 from pygame_gui._constants import UITextEffectType
-from pygame_gui.core.utility import PackageResource
+from pygame_gui.core.package_resource import PackageResource
 
 __all__ = [
     "UIManager",

pygame_gui/core/colour_parser.py

@@ -218,9 +218,11 @@ class ColourValueParserData(TypedDict):
     },
     NumParserType.INT: {"validator": is_int_str, "parser": int},
 }
-"""A mapping for each NumParserType to its corresponding validator and parser for strings of that type's 
-specification"""
 
+"""
+A mapping for each NumParserType to its corresponding validator and parser for strings of that type's
+specification
+"""
 _colourModelSchemas: Dict[str, List[NumParserType]] = {
     "hsl": [NumParserType.DEGREE, NumParserType.PERCENTAGE, NumParserType.PERCENTAGE],
     "hsla": [
@@ -659,11 +661,13 @@ def parse_colour_name(strdata: str) -> pygame.Color:
     (is_valid_hsv_string, parse_hsv_string),
     (is_valid_hsva_string, parse_hsva_string),
 ]
-"""The list of validator and parser function pairs that will be used by is_valid_colour_string and 
-parse_colour_string The functions have no requirement other than the validator confirming a schema and the parser 
-returning a pygame.Color value from the string data if it is valid Note that if new validator and parsing formulas 
-are added, these validators should not overlap if it can be helped, as there's no way to determine whether one colour 
-could be more "valid" than another in that case"""
+"""
+The list of validator and parser function pairs that will be used by is_valid_colour_string and
+parse_colour_string The functions have no requirement other than the validator confirming a schema and the parser
+returning a pygame.Color value from the string data if it is valid Note that if new validator and parsing formulas
+are added, these validators should not overlap if it can be helped, as there's no way to determine whether one colour
+could be more "valid" than another in that case
+"""
 
 
 def is_valid_colour_string(strdata: str) -> bool:

pygame_gui/core/gui_font_pygame.py

@@ -1,4 +1,4 @@
-from typing import Union, IO, Optional, Dict, Tuple
+from typing import Union, IO, Optional, Dict, Tuple, Any
 from os import PathLike
 
 import pygame
@@ -31,13 +31,13 @@ def __init__(
         file: Optional[FileArg],
         size: Union[int, float],
         force_style: bool = False,
-        style: Optional[Dict[str, bool]] = None,
+        style: Optional[Dict[str, Any]] = None,
     ):
         self.__internal_font: Font = Font(
-            file, size
+            file, int(size)
         )  # no resolution option for pygame font?
 
-        self.__internal_font.set_point_size(size)
+        self.__internal_font.set_point_size(int(size))
         self.pad = True
         self.origin = True
         self.__underline = False  # pylint: disable=unused-private-member

pygame_gui/core/interfaces/appearance_theme_interface.py

@@ -14,6 +14,7 @@
     IColourGradientInterface,
 )
 from pygame_gui.core.interfaces.gui_font_interface import IGUIFontInterface
+from pygame_gui.core.package_resource import PackageResource
 
 
 class IUIAppearanceThemeInterface(metaclass=ABCMeta):
@@ -161,7 +162,7 @@ def get_colour_or_gradient(
 
     @abstractmethod
     def load_theme(
-        self, file_path: Union[str, PathLike, io.StringIO, "PackageResource", dict]
+        self, file_path: Union[str, PathLike, io.StringIO, PackageResource, dict]
     ):
         """
         Loads a theme, and currently, all associated data like fonts and images required

pygame_gui/core/interfaces/gui_font_interface.py

@@ -8,6 +8,7 @@ class IGUIFontInterface(metaclass=ABCMeta):
     A font interface, so we can easily switch between pygame.freetype.Font and pygame.Font.
     """
 
+    @abstractmethod
     def size(self, text: str) -> Tuple[int, int]:
         """
         Return the pixel size of a given text string in this font
@@ -23,6 +24,7 @@ def render_premul(self, text: str, text_color: Color) -> Surface:
         Draws text to a surface ready for pre-multiplied alpha-blending
         """
 
+    @abstractmethod
     def render_premul_to(
         self,
         text: str,
@@ -102,6 +104,7 @@ def underline_adjustment(self, value: float):
         :return:
         """
 
+    @abstractmethod
     def get_direction(self) -> int:
         """
 

pygame_gui/core/object_id.py

@@ -1,5 +1,5 @@
 from collections import namedtuple
 
 ObjectID = namedtuple(
-    "ObjectID", field_names=("object_id", "class_id"), defaults=(None, None)
+    "ObjectID", ("object_id", "class_id"), defaults=(None, None)
 )

pygame_gui/core/package_resource.py

@@ -0,0 +1,56 @@
+import os
+import sys
+from typing import Union
+from pathlib import Path
+
+
+def _create_resource_path(relative_path: Union[str, Path]):
+    """
+    Get absolute path to resource, works for dev and for PyInstaller's 'onefile' mode
+
+    :param relative_path: A relative path to a file of some kind.
+
+    """
+
+    try:
+        # PyInstaller creates a temp folder and stores path in _MEIPASS
+        if getattr(sys, 'frozen', False):
+            base_path = sys._MEIPASS  # type: ignore # pylint: disable=no-member,protected-access
+        else:
+            base_path = os.path.abspath(".")
+    except AttributeError:
+        base_path = os.path.abspath(".")
+
+    return os.path.join(base_path, relative_path)
+
+
+class PackageResource:
+    """
+    A data class to handle input for importlib.resources as single parameter.
+
+    :param package: The python package our resource is located in (e.g. 'pygame_gui.data')
+    :param resource: The name of the resource (e.g. 'default_theme.json')
+    """
+
+    def __init__(self, package: str, resource: str):
+        self.package = package
+        self.resource = resource
+
+    def __repr__(self):
+        return f"{self.package}.{self.resource}"
+
+    def to_path(self) -> str:
+        """
+        If we don't have any importlib module to use, we can try to turn the resource into a file
+        path.
+
+        :return: A string path.
+        """
+        root_path = ""
+        relative_path = self.package.replace(".", "/") + "/" + self.resource
+        if self.package.find("pygame_gui") == 0:
+            # This is default data from pygame_gui so relative to pygame_gui rather than app
+            root_path = os.path.abspath(
+                os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+            )
+        return _create_resource_path(os.path.join(root_path, relative_path))

pygame_gui/core/ui_appearance_theme.py

@@ -4,6 +4,7 @@
 import warnings
 
 from contextlib import contextmanager
+from importlib.resources import files, as_file
 from typing import Union, List, Dict, Any, Optional
 
 import pygame
@@ -18,8 +19,9 @@
 from pygame_gui.core.interfaces.appearance_theme_interface import (
     IUIAppearanceThemeInterface,
 )
-from pygame_gui.core.utility import create_resource_path, PackageResource
+from pygame_gui.core.utility import create_resource_path
 from pygame_gui.core.utility import ImageResource, SurfaceResource
+from pygame_gui.core.package_resource import PackageResource
 from pygame_gui.core.ui_font_dictionary import UIFontDictionary
 from pygame_gui.core.ui_shadow import ShadowGenerator
 from pygame_gui.core.surface_cache import SurfaceCache
@@ -30,16 +32,6 @@
     get_commas_outside_enclosing_glyphs,
 )
 
-# First try importlib
-# Then importlib_resources
-try:
-    from importlib.resources import files, as_file
-except ImportError:
-    try:
-        from importlib_resources import files, as_file
-    except ImportError as no_import_lib:
-        raise ImportError from no_import_lib
-
 
 class UIAppearanceTheme(IUIAppearanceThemeInterface):
     """

pygame_gui/core/ui_font_dictionary.py

@@ -10,7 +10,7 @@
     IUIFontDictionaryInterface,
 )
 from pygame_gui.core.resource_loaders import IResourceLoader
-from pygame_gui.core.utility import PackageResource
+from pygame_gui.core.package_resource import PackageResource
 from pygame_gui.core.utility import FontResource
 
 

pygame_gui/core/ui_shadow.py

@@ -360,7 +360,7 @@ def find_closest_shadow_scale_to_size(
         """
         lowest_diff = 1000000000000
         closest_key = None
-        if shape == "rectangle":
+        if shape == "rectangle" and corner_radius is not None:
             return self.create_new_rectangle_shadow(
                 size[0], size[1], shadow_width, corner_radius
             )

pygame_gui/core/utility.py

@@ -26,7 +26,7 @@
 from pygame_gui.core.interfaces import IUIManagerInterface, IGUIFontInterface
 from pygame_gui.core.gui_font_freetype import GUIFontFreetype
 from pygame_gui.core.gui_font_pygame import GUIFontPygame
-
+from pygame_gui.core.package_resource import PackageResource
 
 __default_manager: Optional[IUIManagerInterface] = None  # pylint: disable=invalid-name
 
@@ -365,38 +365,6 @@ def apply_colour_to_surface(
         shape_surface.blit(colour_surface, (0, 0), special_flags=pygame.BLEND_RGBA_MULT)
 
 
-class PackageResource:
-    """
-    A data class to handle input for importlib.resources as single parameter.
-
-    :param package: The python package our resource is located in (e.g. 'pygame_gui.data')
-    :param resource: The name of the resource (e.g. 'default_theme.json')
-    """
-
-    def __init__(self, package: str, resource: str):
-        self.package = package
-        self.resource = resource
-
-    def __repr__(self):
-        return f"{self.package}.{self.resource}"
-
-    def to_path(self) -> str:
-        """
-        If we don't have any importlib module to use, we can try to turn the resource into a file
-        path.
-
-        :return: A string path.
-        """
-        root_path = ""
-        relative_path = self.package.replace(".", "/") + "/" + self.resource
-        if self.package.find("pygame_gui") == 0:
-            # This is default data from pygame_gui so relative to pygame_gui rather than app
-            root_path = os.path.abspath(
-                os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
-            )
-        return create_resource_path(os.path.join(root_path, relative_path))
-
-
 class FontResource:
     """
     A resource class to handle all the data we need to load a python font object from a

pygame_gui/elements/ui_text_box.py

@@ -168,7 +168,7 @@ def __init__(
 
         self.link_hover_chunks = []  # container for any link chunks we have
 
-        self.active_text_effect = None  # type: Optional[TextEffect]
+        self.active_text_effect: Optional[TextEffect] = None
         self.active_text_chunk_effects = []
 
         self.scroll_bar_width = 20

pygame_gui/ui_manager.py

@@ -22,10 +22,10 @@
     BlockingThreadedResourceLoader,
 )
 from pygame_gui.core.utility import (
-    PackageResource,
     get_default_manager,
     set_default_manager,
 )
+from pygame_gui.core.package_resource import PackageResource
 from pygame_gui.core.layered_gui_group import LayeredGUIGroup
 from pygame_gui.core import ObjectID
 

pygame_gui/windows/ui_file_dialog.py

@@ -115,7 +115,7 @@ def __init__(
 
         self.last_valid_directory_path = self.current_directory_path
 
-        self.current_file_list = None  # type: Union[List[str], None]
+        self.current_file_list: Optional[List[str]] = None
         self.update_current_file_list()
 
         self._setup_ui_elements()

setup.cfg

@@ -3,6 +3,7 @@
 description_file = README.md
 [flake8]
 max-line-length = 120
+extend-ignore = E203
 [pylint.MESSAGES CONTROL]
 extension-pkg-whitelist=pygame
 disable=no-else-return,too-many-instance-attributes,too-many-ancestors,too-many-return-statements,too-many-boolean-expressions,too-many-branches,too-many-arguments,too-many-statements,too-many-locals,too-many-lines,too-many-positional-arguments,too-many-public-methods,too-many-nested-blocks,missing-module-docstring,too-few-public-methods,fixme,duplicate-code