45 | Remove redundant typing imports

Author: LeanderCS

docs/source/guides/create_own_components.rst

@@ -31,7 +31,7 @@ Example implementation
 
 .. code-block:: python
 
-    from typing import Any, Dict
+    from typing import Any
 
     from flask_inputfilter.Condition import BaseCondition
 
@@ -45,7 +45,7 @@ Example implementation
             self.first_field = first_field
             self.second_field = second_field
 
-        def check(self, data: Dict[str, Any]) -> bool:
+        def check(self, data: dict[str, Any]) -> bool:
             return data.get(self.first_field) == data.get(self.second_field)
 
 
@@ -69,7 +69,7 @@ Example implementation
 .. code-block:: python
 
     from datetime import date, datetime
-    from typing import Any, Union
+    from typing import Any
 
     from flask_inputfilter.Filter import BaseFilter
 
@@ -80,7 +80,7 @@ Example implementation
         Supports ISO 8601 formatted strings.
         """
 
-        def apply(self, value: Any) -> Union[datetime, Any]:
+        def apply(self, value: Any) -> datetime|Any:
             if isinstance(value, datetime):
                 return value
 
@@ -94,8 +94,7 @@ Example implementation
                 except ValueError:
                     return value
 
-            else:
-                return value
+            return value
 
 
 Validator
@@ -116,7 +115,7 @@ Example implementation
 
 .. code-block:: python
 
-    from typing import Any, List, Optional
+    from typing import Any, Optional
 
     from flask_inputfilter.Exception import ValidationError
     from flask_inputfilter.Validator import BaseValidator
@@ -129,7 +128,7 @@ Example implementation
 
         def __init__(
             self,
-            haystack: List[Any],
+            haystack: list[Any],
             strict: bool = False,
             error_message: Optional[str] = None,
         ) -> None:

env_configs/cython.Dockerfile

@@ -2,7 +2,9 @@ FROM python:3.7-slim
 
 WORKDIR /app
 
-RUN apt-get update && apt-get install -y g++ git
+RUN apt-get update  \
+    && apt-get install -y g++ git \
+    && apt-get clean
 
 COPY pyproject.toml /app
 

env_configs/env.Dockerfile

@@ -2,35 +2,37 @@ FROM debian:buster-slim
 
 WORKDIR /app
 
-RUN apt-get update && apt-get install -y \
-    build-essential \
-    curl \
-    g++ \
-    git \
-    libbz2-dev \
-    libffi-dev \
-    libjpeg-dev \
-    liblzma-dev \
-    libncurses5-dev \
-    libncursesw5-dev \
-    libreadline-dev \
-    libsqlite3-dev \
-    libssl-dev \
-    llvm \
-    make \
-    python3-dev \
-    tk-dev \
-    wget \
-    xz-utils \
-    zlib1g-dev
+RUN apt-get update  \
+    && apt-get install -y \
+        build-essential \
+        curl \
+        g++ \
+        git \
+        libbz2-dev \
+        libffi-dev \
+        libjpeg-dev \
+        liblzma-dev \
+        libncurses5-dev \
+        libncursesw5-dev \
+        libreadline-dev \
+        libsqlite3-dev \
+        libssl-dev \
+        llvm \
+        make \
+        python3-dev \
+        tk-dev \
+        wget \
+        xz-utils \
+        zlib1g-dev \
+    && apt-get clean
 
 RUN curl https://pyenv.run | bash
 
 ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:/root/.pyenv/versions/3.7.12/bin:$PATH"
-RUN echo 'export PATH="/root/.pyenv/bin:$PATH"' >> ~/.bashrc
-RUN echo 'eval "$(pyenv init --path)"' >> ~/.bashrc
-RUN echo 'eval "$(pyenv init -)"' >> ~/.bashrc
-RUN echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bashrc
+RUN echo 'export PATH="/root/.pyenv/bin:$PATH"' >> ~/.bashrc \
+    && echo 'eval "$(pyenv init --path)"' >> ~/.bashrc \
+    && echo 'eval "$(pyenv init -)"' >> ~/.bashrc \
+    && echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bashrc
 
 RUN /root/.pyenv/bin/pyenv install 3.7.12
 RUN /root/.pyenv/bin/pyenv install 3.8.12

env_configs/pure.Dockerfile

@@ -2,7 +2,9 @@ FROM python:3.7-slim
 
 WORKDIR /app
 
-RUN apt-get update && apt-get install -y git
+RUN apt-get update  \
+    && apt-get install -y git \
+    && apt-get clean
 
 COPY pyproject.toml /app
 

flask_inputfilter/Condition/CustomCondition.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import Any, Callable, Dict
+from collections.abc import Callable
+from typing import Any, Dict
 
 from flask_inputfilter.Condition import BaseCondition
 

flask_inputfilter/Filter/Base64ImageDownscaleFilter.py

@@ -1,11 +1,10 @@
 from __future__ import annotations
 
 import base64
-import binascii
 import io
 from typing import Any, Optional
 
-from PIL import Image, UnidentifiedImageError
+from PIL import Image
 
 from flask_inputfilter.Filter import BaseFilter
 
@@ -39,13 +38,7 @@ def apply(self, value: Any) -> Any:
             image = Image.open(io.BytesIO(base64.b64decode(value)))
             return self.resize_picture(image)
 
-        except (
-            binascii.Error,
-            UnidentifiedImageError,
-            OSError,
-            ValueError,
-            TypeError,
-        ):
+        except (OSError, ValueError, TypeError):
             return value
 
     def resize_picture(self, image: Image) -> str:

flask_inputfilter/Filter/Base64ImageResizeFilter.py

@@ -1,11 +1,10 @@
 from __future__ import annotations
 
 import base64
-import binascii
 import io
 from typing import Any
 
-from PIL import Image, UnidentifiedImageError
+from PIL import Image
 
 from flask_inputfilter.Enum import ImageFormatEnum
 from flask_inputfilter.Filter import BaseFilter
@@ -46,13 +45,7 @@ def apply(self, value: Any) -> Any:
 
             value = Image.open(io.BytesIO(base64.b64decode(value)))
             return self.reduce_image(value)
-        except (
-            binascii.Error,
-            UnidentifiedImageError,
-            OSError,
-            ValueError,
-            TypeError,
-        ):
+        except (OSError, ValueError, TypeError):
             return value
 
     def reduce_image(self, image: Image) -> Image:

flask_inputfilter/Filter/ToEnumFilter.py

@@ -17,10 +17,7 @@ def __init__(self, enum_class: Type[Enum]) -> None:
         self.enum_class = enum_class
 
     def apply(self, value: Any) -> Union[Enum, Any]:
-        if not isinstance(value, (str, int)):
-            return value
-
-        elif isinstance(value, Enum):
+        if not isinstance(value, (str, int)) or isinstance(value, Enum):
             return value
 
         try:

flask_inputfilter/Filter/ToIsoFilter.py

@@ -12,10 +12,7 @@ class ToIsoFilter(BaseFilter):
     """
 
     def apply(self, value: Any) -> Union[str, Any]:
-        if isinstance(value, datetime):
-            return value.isoformat()
-
-        elif isinstance(value, date):
+        if isinstance(value, (datetime, date)):
             return value.isoformat()
 
         return value