Skip to content

Commit 5986364

Browse files
committed
fixing mypy
1 parent d057d23 commit 5986364

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed

mypy.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[mypy]
2-
python_version = 3.6
2+
python_version = 3.8
33

44
show_column_numbers = True
55

@@ -19,4 +19,4 @@ check_untyped_defs = True
1919
no_implicit_reexport = True
2020

2121
[mypy-ninja_extra.compatible.*]
22-
ignore_errors = True
22+
ignore_errors = True

ninja_extra/controllers/response.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class ControllerResponseMeta(type):
6161
pass
6262

6363
class GenericControllerResponse(metaclass=ControllerResponseMeta):
64-
def __new__(
64+
def __new__( # type:ignore[misc]
6565
cls: Type["ControllerResponse[T]"], *args: Any, **kwargs: Any
6666
) -> "ControllerResponse[T]":
6767
if "_schema" not in cls.__dict__:
@@ -121,7 +121,7 @@ class Id(ControllerResponse[T]):
121121
==> 201, {id: "883a1a3d-7b10-458d-bccc-f9b7219342c9"}
122122
"""
123123

124-
_schema = IdSchema[Any] # type: ignore
124+
_schema = IdSchema[Any]
125125
status_code: int = status.HTTP_201_CREATED
126126

127127
def __init__(self, id: T) -> None:
@@ -154,7 +154,7 @@ class ASchema(BaseModel):
154154
"""
155155

156156
status_code: int = status.HTTP_200_OK
157-
_schema = OkSchema[Any] # type: ignore
157+
_schema = OkSchema[Any]
158158

159159
def __init__(self, message: Optional[Any] = None) -> None:
160160
super(Ok, self).__init__()
@@ -184,7 +184,7 @@ class ErrorSchema(BaseModel):
184184
"""
185185

186186
status_code: int = status.HTTP_200_OK
187-
_schema = DetailSchema[Any] # type: ignore
187+
_schema = DetailSchema[Any]
188188

189189
def __init__(
190190
self, message: Optional[Any] = None, status_code: int = status.HTTP_200_OK

ninja_extra/pagination.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ def get_paginated_response(self, *, base_url: str, page: Page) -> DictStrAny:
110110

111111
@classmethod
112112
def get_response_schema(
113-
cls, response_schema: Union[Schema, Type[Schema], Any]
113+
cls, response_schema: Union[Type[Schema], Type[Any]]
114114
) -> Any:
115-
return PaginatedResponseSchema[response_schema]
115+
return PaginatedResponseSchema[response_schema] # type: ignore[valid-type]
116116

117117
def get_next_link(self, url: str, page: Page) -> Optional[str]:
118118
if not page.has_next():

ninja_extra/schemas/response.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import sys
2-
from typing import Any, Dict, Generic, List, Optional, Type, TypeVar
2+
from typing import Any, Dict, Generic, List, Optional, Type, TypeVar, Union
33

44
from ninja import Schema
55
from ninja.constants import NOT_SET
@@ -34,7 +34,9 @@ class PaginatedResponseSchema(
3434

3535
# Pydantic GenericModels has not way of identifying the _orig
3636
# __generic_model__ is more like a fix for that
37-
PaginatedResponseSchema.__generic_model__ = PaginatedResponseSchema
37+
PaginatedResponseSchema.__generic_model__ = ( # type:ignore[attr-defined]
38+
PaginatedResponseSchema
39+
)
3840

3941
class NinjaPaginationResponseSchema(
4042
GenericModel, Generic[T], BaseNinjaResponseSchema
@@ -47,22 +49,24 @@ def validate_items(cls, value: Any) -> Any:
4749
return list(value)
4850
return value
4951

50-
NinjaPaginationResponseSchema.__generic_model__ = NinjaPaginationResponseSchema
52+
NinjaPaginationResponseSchema.__generic_model__ = ( # type:ignore[attr-defined]
53+
NinjaPaginationResponseSchema
54+
)
5155

5256
class IdSchema(GenericModel, Generic[T], Schema):
5357
id: T
5458

55-
IdSchema.__generic_model__ = IdSchema
59+
IdSchema.__generic_model__ = IdSchema # type:ignore[attr-defined]
5660

5761
class OkSchema(GenericModel, Generic[T], Schema):
58-
detail: T = "Action was successful"
62+
detail: Union[T, str] = "Action was successful"
5963

60-
OkSchema.__generic_model__ = OkSchema
64+
OkSchema.__generic_model__ = OkSchema # type:ignore[attr-defined]
6165

6266
class DetailSchema(GenericModel, Generic[T], Schema):
6367
detail: T
6468

65-
DetailSchema.__generic_model__ = DetailSchema
69+
DetailSchema.__generic_model__ = DetailSchema # type:ignore[attr-defined]
6670
else: # pragma: no cover
6771

6872
class IdSchema(GenericType, generic_base_name="IdSchema"):

0 commit comments

Comments
 (0)