Merge pull request #103 from LaboratoireMecaniqueLille/docs/wrong_sha…

…pe_typehint

Wrong type hint for the image shape argument

src/crappy/blocks/camera.py

@@ -68,7 +68,8 @@ def __init__(self,
                save_backend: Optional[str] = None,
                image_generator: Optional[Callable[[float, float],
                                                   np.ndarray]] = None,
-               img_shape: Optional[Tuple[int, int]] = None,
+               img_shape: Optional[Union[Tuple[int, int],
+                                         Tuple[int, int, int]]] = None,
                img_dtype: Optional[str] = None,
                **kwargs) -> None:
     """Sets the arguments and initializes the parent class.

src/crappy/blocks/camera_processes/camera_process.py

@@ -87,7 +87,7 @@ def set_shared(self,
                  lock: RLock,
                  barrier: Barrier,
                  event: Event,
-                 shape: Tuple[int, int],
+                 shape: Union[Tuple[int, int], Tuple[int, int, int]],
                  dtype,
                  to_draw_conn: Optional[Connection],
                  outputs: List[Link],

src/crappy/tool/camera_config/camera_config.py

@@ -6,7 +6,7 @@
 from platform import system
 import numpy as np
 from time import time, sleep
-from typing import Optional, Tuple
+from typing import Optional, Tuple, Union
 from pkg_resources import resource_string
 from io import BytesIO
 import logging
@@ -79,7 +79,7 @@ def __init__(self,
 
     super().__init__()
     self._camera = camera
-    self.shape = None
+    self.shape: Optional[Union[Tuple[int, int], Tuple[int, int, int]]] = None
     self.dtype = None
     self._logger: Optional[logging.Logger] = None