Update flake8 plugins (#1579)

* Update `flake8` plugins

* Fix lint rules

Author: sobolevn

.pre-commit-config.yaml

@@ -26,8 +26,8 @@ repos:
     hooks:
       - id: flake8
         additional_dependencies:
-        - flake8-no-pep420==2.4.0
-        - flake8-pyi==22.11.0
+        - flake8-no-pep420==2.6.0
+        - flake8-pyi==23.5.0
         types: []
         files: ^.*.pyi?$
 

django-stubs/contrib/staticfiles/finders.pyi

@@ -56,11 +56,4 @@ def find(path: str, all: Literal[False] = ...) -> str | None: ...
 @overload
 def find(path: str, all: Literal[True]) -> list[str]: ...
 def get_finders() -> Iterator[BaseFinder]: ...
-@overload
-def get_finder(
-    import_path: Literal["django.contrib.staticfiles.finders.FileSystemFinder"],
-) -> FileSystemFinder: ...
-@overload
-def get_finder(
-    import_path: Literal["django.contrib.staticfiles.finders.AppDirectoriesFinder"],
-) -> AppDirectoriesFinder: ...
+def get_finder(import_path: str) -> BaseFinder: ...

django-stubs/db/models/fields/__init__.pyi

@@ -238,11 +238,11 @@ class IntegerField(Field[_ST, _GT]):
 class PositiveIntegerRelDbTypeMixin:
     def rel_db_type(self, connection: BaseDatabaseWrapper) -> str: ...
 
+class SmallIntegerField(IntegerField[_ST, _GT]): ...
+class BigIntegerField(IntegerField[_ST, _GT]): ...
 class PositiveIntegerField(PositiveIntegerRelDbTypeMixin, IntegerField[_ST, _GT]): ...
 class PositiveSmallIntegerField(PositiveIntegerRelDbTypeMixin, SmallIntegerField[_ST, _GT]): ...
 class PositiveBigIntegerField(PositiveIntegerRelDbTypeMixin, BigIntegerField[_ST, _GT]): ...
-class SmallIntegerField(IntegerField[_ST, _GT]): ...
-class BigIntegerField(IntegerField[_ST, _GT]): ...
 
 class FloatField(Field[_ST, _GT]):
     _pyi_private_set_type: float | int | str | Combinable

django-stubs/db/models/fields/json.pyi

@@ -44,6 +44,7 @@ class HasAnyKeys(HasKeys):
 
 class HasKeyOrArrayIndex(HasKey): ...
 class JSONExact(lookups.Exact): ...
+class CaseInsensitiveMixin: ...
 class JSONIContains(CaseInsensitiveMixin, lookups.IContains): ...
 
 class KeyTransform(Transform):
@@ -64,7 +65,6 @@ KT: Callable[[str], KeyTextTransform]
 class KeyTransformTextLookupMixin:
     def __init__(self, key_transform: Any, *args: Any, **kwargs: Any) -> None: ...
 
-class CaseInsensitiveMixin: ...
 class KeyTransformIsNull(lookups.IsNull): ...
 class KeyTransformIn(lookups.In): ...
 class KeyTransformExact(JSONExact): ...

django-stubs/db/models/sql/query.pyi

@@ -31,7 +31,7 @@ class RawQuery:
     def get_columns(self) -> list[str]: ...
     def __iter__(self) -> Iterator[Any]: ...
     @property
-    def params_type(self) -> None | type[dict] | type[tuple]: ...
+    def params_type(self) -> type[dict | tuple] | None: ...
 
 class Query(BaseExpression):
     related_ids: list[int] | None

django-stubs/views/debug.pyi

@@ -1,7 +1,8 @@
+import re
 from collections.abc import Callable, ItemsView, Iterator
 from pathlib import Path
 from types import TracebackType
-from typing import Any, Pattern
+from typing import Any
 
 from django.http.request import HttpRequest, QueryDict
 from django.http.response import Http404, HttpResponse
@@ -24,7 +25,7 @@ def get_exception_reporter_filter(request: HttpRequest | None) -> SafeExceptionR
 
 class SafeExceptionReporterFilter:
     cleansed_substitute: str
-    hidden_settings: Pattern[str]
+    hidden_settings: re.Pattern[str]
     def cleanse_setting(self, key: int | str, value: Any) -> Any: ...
     def get_safe_settings(self) -> dict[str, Any]: ...
     def is_active(self, request: HttpRequest | None) -> bool: ...