Skip to content

Commit c97a0cc

Browse files
committed
Fix mypy warnings in dependency_injector.ext
1 parent 0ada62a commit c97a0cc

File tree

4 files changed

+26
-23
lines changed

4 files changed

+26
-23
lines changed

src/dependency_injector/ext/aiohttp.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
from dependency_injector import providers
99

10-
1110
warnings.warn(
1211
'Module "dependency_injector.ext.aiohttp" is deprecated since '
1312
'version 4.0.0. Use "dependency_injector.wiring" module instead.',
Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
from typing import Awaitable as _Awaitable
1+
from typing import Any, Awaitable as _Awaitable, TypeVar
22

33
from dependency_injector import providers
44

5-
class Application(providers.Singleton): ...
6-
class Extension(providers.Singleton): ...
7-
class Middleware(providers.DelegatedCallable): ...
8-
class MiddlewareFactory(providers.Factory): ...
5+
T = TypeVar("T")
96

10-
class View(providers.Callable):
11-
def as_view(self) -> _Awaitable: ...
7+
class Application(providers.Singleton[T]): ...
8+
class Extension(providers.Singleton[T]): ...
9+
class Middleware(providers.DelegatedCallable[T]): ...
10+
class MiddlewareFactory(providers.Factory[T]): ...
1211

13-
class ClassBasedView(providers.Factory):
14-
def as_view(self) -> _Awaitable: ...
12+
class View(providers.Callable[T]):
13+
def as_view(self) -> _Awaitable[T]: ...
14+
15+
class ClassBasedView(providers.Factory[T]):
16+
def as_view(self) -> _Awaitable[T]: ...

src/dependency_injector/ext/flask.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
"""Flask extension module."""
22

33
from __future__ import absolute_import
4+
45
import warnings
56

67
from flask import request as flask_request
78

8-
from dependency_injector import providers, errors
9-
9+
from dependency_injector import errors, providers
1010

1111
warnings.warn(
1212
'Module "dependency_injector.ext.flask" is deprecated since '

src/dependency_injector/ext/flask.pyi

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
from typing import Union, Optional, Callable as _Callable, Any
1+
from typing import Any, Callable as _Callable, Optional, TypeVar, Union
2+
3+
from flask.wrappers import Request
24

3-
from flask import request as flask_request
45
from dependency_injector import providers
56

6-
request: providers.Object[flask_request]
7+
request: providers.Object[Request]
8+
T = TypeVar("T")
79

8-
class Application(providers.Singleton): ...
9-
class Extension(providers.Singleton): ...
10+
class Application(providers.Singleton[T]): ...
11+
class Extension(providers.Singleton[T]): ...
1012

11-
class View(providers.Callable):
12-
def as_view(self) -> _Callable[..., Any]: ...
13+
class View(providers.Callable[T]):
14+
def as_view(self) -> _Callable[..., T]: ...
1315

14-
class ClassBasedView(providers.Factory):
15-
def as_view(self, name: str) -> _Callable[..., Any]: ...
16+
class ClassBasedView(providers.Factory[T]):
17+
def as_view(self, name: str) -> _Callable[..., T]: ...
1618

1719
def as_view(
18-
provider: Union[View, ClassBasedView], name: Optional[str] = None
19-
) -> _Callable[..., Any]: ...
20+
provider: Union[View[T], ClassBasedView[T]], name: Optional[str] = None
21+
) -> _Callable[..., T]: ...

0 commit comments

Comments
 (0)