From 33d4dc7dae8fb825d3804887a14d7594dc655abf Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Tue, 28 Jun 2022 23:25:50 +0300 Subject: [PATCH] Fix `logger` type in all modules (#1031) * Fix `logger` type in all modules * Fix CI --- django-stubs/contrib/gis/admin/widgets.pyi | 3 ++- django-stubs/contrib/gis/db/backends/mysql/schema.pyi | 3 ++- django-stubs/contrib/gis/forms/widgets.pyi | 3 ++- django-stubs/contrib/gis/gdal/libgdal.pyi | 3 ++- django-stubs/contrib/gis/geos/libgeos.pyi | 3 ++- django-stubs/db/backends/base/schema.pyi | 3 ++- django-stubs/db/backends/utils.pyi | 3 ++- django-stubs/middleware/csrf.pyi | 3 ++- django-stubs/template/base.pyi | 3 ++- django-stubs/test/utils.pyi | 3 ++- django-stubs/utils/log.pyi | 2 +- 11 files changed, 21 insertions(+), 11 deletions(-) diff --git a/django-stubs/contrib/gis/admin/widgets.pyi b/django-stubs/contrib/gis/admin/widgets.pyi index a1b3888..7e23089 100644 --- a/django-stubs/contrib/gis/admin/widgets.pyi +++ b/django-stubs/contrib/gis/admin/widgets.pyi @@ -1,9 +1,10 @@ +from logging import Logger from typing import Any from django.forms.widgets import Textarea as Textarea geo_context: Any -logger: Any +logger: Logger class OpenLayersWidget(Textarea): def get_context(self, name: Any, value: Any, attrs: Any): ... diff --git a/django-stubs/contrib/gis/db/backends/mysql/schema.pyi b/django-stubs/contrib/gis/db/backends/mysql/schema.pyi index 6cc782f..e831c2d 100644 --- a/django-stubs/contrib/gis/db/backends/mysql/schema.pyi +++ b/django-stubs/contrib/gis/db/backends/mysql/schema.pyi @@ -1,8 +1,9 @@ +from logging import Logger from typing import Any from django.db.backends.mysql.schema import DatabaseSchemaEditor as DatabaseSchemaEditor -logger: Any +logger: Logger class MySQLGISSchemaEditor(DatabaseSchemaEditor): sql_add_spatial_index: str = ... diff --git a/django-stubs/contrib/gis/forms/widgets.pyi b/django-stubs/contrib/gis/forms/widgets.pyi index 1f9a2f4..9f9d7ba 100644 --- a/django-stubs/contrib/gis/forms/widgets.pyi +++ b/django-stubs/contrib/gis/forms/widgets.pyi @@ -1,8 +1,9 @@ +from logging import Logger from typing import Any, Optional from django.forms.widgets import Widget as Widget -logger: Any +logger: Logger class BaseGeometryWidget(Widget): geom_type: str = ... diff --git a/django-stubs/contrib/gis/gdal/libgdal.pyi b/django-stubs/contrib/gis/gdal/libgdal.pyi index 3bc24d4..cdf8901 100644 --- a/django-stubs/contrib/gis/gdal/libgdal.pyi +++ b/django-stubs/contrib/gis/gdal/libgdal.pyi @@ -1,6 +1,7 @@ +from logging import Logger from typing import Any -logger: Any +logger: Logger lib_path: Any lib_names: Any lgdal: Any diff --git a/django-stubs/contrib/gis/geos/libgeos.pyi b/django-stubs/contrib/gis/geos/libgeos.pyi index 5c5b4c8..e3947cd 100644 --- a/django-stubs/contrib/gis/geos/libgeos.pyi +++ b/django-stubs/contrib/gis/geos/libgeos.pyi @@ -1,7 +1,8 @@ from ctypes import Structure +from logging import Logger from typing import Any, Optional -logger: Any +logger: Logger def load_geos(): ... diff --git a/django-stubs/db/backends/base/schema.pyi b/django-stubs/db/backends/base/schema.pyi index edd3218..b2ed2c5 100644 --- a/django-stubs/db/backends/base/schema.pyi +++ b/django-stubs/db/backends/base/schema.pyi @@ -1,3 +1,4 @@ +from logging import Logger from typing import Any, ContextManager, List, Optional, Sequence, Tuple, Type, Union from django.db.backends.base.base import BaseDatabaseWrapper @@ -6,7 +7,7 @@ from django.db.models.base import Model from django.db.models.fields import Field from django.db.models.indexes import Index -logger: Any +logger: Logger class BaseDatabaseSchemaEditor(ContextManager[Any]): sql_create_table: str = ... diff --git a/django-stubs/db/backends/utils.pyi b/django-stubs/db/backends/utils.pyi index 02bf51d..fc5b794 100644 --- a/django-stubs/db/backends/utils.pyi +++ b/django-stubs/db/backends/utils.pyi @@ -3,6 +3,7 @@ import sys import types from contextlib import contextmanager from decimal import Decimal +from logging import Logger from typing import Any, Dict, Generator, Iterator, List, Mapping, Optional, Sequence, Tuple, Type, Union, overload from uuid import UUID @@ -11,7 +12,7 @@ if sys.version_info < (3, 8): else: from typing import Literal -logger: Any +logger: Logger # Python types that can be adapted to SQL. _SQLType = Union[ diff --git a/django-stubs/middleware/csrf.pyi b/django-stubs/middleware/csrf.pyi index 1dd8c8d..c8affb2 100644 --- a/django-stubs/middleware/csrf.pyi +++ b/django-stubs/middleware/csrf.pyi @@ -1,10 +1,11 @@ +from logging import Logger from typing import Any, Callable, Dict, Optional, Tuple from django.http.request import HttpRequest from django.http.response import HttpResponseBase, HttpResponseForbidden from django.utils.deprecation import MiddlewareMixin -logger: Any +logger: Logger REASON_NO_REFERER: str REASON_BAD_REFERER: str REASON_NO_CSRF_COOKIE: str diff --git a/django-stubs/template/base.pyi b/django-stubs/template/base.pyi index d25cc49..f70a1d0 100644 --- a/django-stubs/template/base.pyi +++ b/django-stubs/template/base.pyi @@ -1,4 +1,5 @@ from enum import Enum +from logging import Logger from typing import ( Any, Callable, @@ -35,7 +36,7 @@ SINGLE_BRACE_START: str SINGLE_BRACE_END: str UNKNOWN_SOURCE: str tag_re: Pattern[str] -logger: Any +logger: Logger class TokenType(Enum): TEXT: int = ... diff --git a/django-stubs/test/utils.pyi b/django-stubs/test/utils.pyi index 25df3c6..7977870 100644 --- a/django-stubs/test/utils.pyi +++ b/django-stubs/test/utils.pyi @@ -2,6 +2,7 @@ import decimal from contextlib import contextmanager from decimal import Decimal from io import StringIO +from logging import Logger from typing import ( Any, Callable, @@ -115,7 +116,7 @@ class override_script_prefix(TestContextDecorator): old_prefix: str = ... class LoggingCaptureMixin: - logger: Any = ... + logger: Logger = ... old_stream: Any = ... logger_output: Any = ... def setUp(self) -> None: ... diff --git a/django-stubs/utils/log.pyi b/django-stubs/utils/log.pyi index af036e8..a6d1b11 100644 --- a/django-stubs/utils/log.pyi +++ b/django-stubs/utils/log.pyi @@ -5,7 +5,7 @@ from typing import Any, Callable, Dict, Optional, Union from django.core.management.color import Style from django.http import HttpRequest, HttpResponse -request_logger: Any +request_logger: Logger DEFAULT_LOGGING: Any def configure_logging(logging_config: str, logging_settings: Dict[str, Any]) -> None: ...