Merge pull request #758 from hx2A/fix-typehints

fix some typehints

Author: hx2A

py5-docs/Reference/api_en/Sketch_convert_cached_image.txt

@@ -5,11 +5,11 @@ category = image
 subcategory = loading_displaying
 
 @@ signatures
-convert_cached_image(obj: Any, force_conversion: bool = False, **kwargs: dict[str, Any]) -> Py5Image
+convert_cached_image(obj: Any, force_conversion: bool = False, **kwargs: Any) -> Py5Image
 
 @@ variables
 force_conversion: bool = False - force conversion of object if it is already in the cache
-kwargs: dict[str, Any] - keyword arguments for conversion function
+kwargs: Any - keyword arguments for conversion function
 obj: Any - object to convert into a Py5Image object
 
 @@ description

py5-docs/Reference/api_en/Sketch_convert_cached_shape.txt

@@ -5,11 +5,11 @@ category = shape
 subcategory = None
 
 @@ signatures
-convert_cached_shape(obj: Any, force_conversion: bool = False, **kwargs: dict[str, Any]) -> Py5Shape
+convert_cached_shape(obj: Any, force_conversion: bool = False, **kwargs: Any) -> Py5Shape
 
 @@ variables
 force_conversion: bool = False - force conversion of object if it is already in the cache
-kwargs: dict[str, Any] - keyword arguments for conversion function
+kwargs: Any - keyword arguments for conversion function
 obj: Any - object to convert into a Py5Shape object
 
 @@ description

py5-docs/Reference/api_en/Sketch_convert_image.txt

@@ -5,11 +5,11 @@ category = image
 subcategory = loading_displaying
 
 @@ signatures
-convert_image(obj: Any, *, dst: Py5Image = None, **kwargs: dict[str, Any]) -> Py5Image
+convert_image(obj: Any, *, dst: Py5Image | None = None, **kwargs: Any) -> Py5Image
 
 @@ variables
-dst: Py5Image = None - existing Py5Image object to put the converted image into
-kwargs: dict[str, Any] - keyword arguments for conversion function
+dst: Py5Image | None = None - existing Py5Image object to put the converted image into
+kwargs: Any - keyword arguments for conversion function
 obj: Any - object to convert into a Py5Image object
 
 @@ description

py5-docs/Reference/api_en/Sketch_convert_shape.txt

@@ -5,10 +5,10 @@ category = shape
 subcategory = None
 
 @@ signatures
-convert_shape(obj: Any, **kwargs: dict[str, Any]) -> Py5Shape
+convert_shape(obj: Any, **kwargs: Any) -> Py5Shape
 
 @@ variables
-kwargs: dict[str, Any] - keyword arguments for conversion function
+kwargs: Any - keyword arguments for conversion function
 obj: Any - object to convert into a Py5Shape object
 
 @@ description

py5-docs/Reference/api_en/Sketch_create_image_from_numpy.txt

@@ -5,12 +5,12 @@ category = image
 subcategory = loading_displaying
 
 @@ signatures
-create_image_from_numpy(array: npt.NDArray[np.uint8], bands: str = "ARGB", *, dst: Py5Image = None) -> Py5Image
+create_image_from_numpy(array: npt.NDArray[np.uint8], bands: str = "ARGB", *, dst: Py5Image | None = None, ) -> Py5Image
 
 @@ variables
 array: npt.NDArray[np.uint8] - numpy image array
 bands: str = "ARGB" - color channels in array
-dst: Py5Image = None - existing Py5Image object to put the image data into
+dst: Py5Image | None = None - existing Py5Image object to put the image data into
 
 @@ description
 Convert a numpy array into a Py5Image object. The numpy array must have 3 dimensions and the array's `dtype` must be `np.uint8`. The size of `array`'s first and second dimensions will be the image's height and width, respectively. The third dimension is for the array's color channels.

py5-resources/py5-module/src/py5/sketch.py

@@ -822,7 +822,11 @@ def _get_sync_draw(self):
     # *** Py5Image methods ***
 
     def create_image_from_numpy(
-        self, array: npt.NDArray[np.uint8], bands: str = "ARGB", *, dst: Py5Image = None
+        self,
+        array: npt.NDArray[np.uint8],
+        bands: str = "ARGB",
+        *,
+        dst: Py5Image | None = None,
     ) -> Py5Image:
         """$class_Sketch_create_image_from_numpy"""
         height, width = array.shape[:2]
@@ -839,7 +843,7 @@ def create_image_from_numpy(
         return py5_img
 
     def convert_image(
-        self, obj: Any, *, dst: Py5Image = None, **kwargs: dict[str, Any]
+        self, obj: Any, *, dst: Py5Image | None = None, **kwargs: Any
     ) -> Py5Image:
         """$class_Sketch_convert_image"""
         if isinstance(obj, (Py5Image, Py5Graphics)):
@@ -854,7 +858,7 @@ def convert_image(
             return result
 
     def convert_cached_image(
-        self, obj: Any, force_conversion: bool = False, **kwargs: dict[str, Any]
+        self, obj: Any, force_conversion: bool = False, **kwargs: Any
     ) -> Py5Image:
         """$class_Sketch_convert_cached_image"""
         try:
@@ -881,14 +885,14 @@ def convert_cached_image(
 
             return converted_obj
 
-    def convert_shape(self, obj: Any, **kwargs: dict[str, Any]) -> Py5Shape:
+    def convert_shape(self, obj: Any, **kwargs: Any) -> Py5Shape:
         """$class_Sketch_convert_shape"""
         if isinstance(obj, Py5Shape):
             return obj
         return shape_conversion._convert(self, obj, **kwargs)
 
     def convert_cached_shape(
-        self, obj: Any, force_conversion: bool = False, **kwargs: dict[str, Any]
+        self, obj: Any, force_conversion: bool = False, **kwargs: Any
     ) -> Py5Shape:
         """$class_Sketch_convert_cached_shape"""
         try: