Skip to content

Commit 4ed9a55

Browse files
author
ruaabrw
committed
fix after rebase
1 parent a13e388 commit 4ed9a55

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

packages/modern-di/modern_di/container.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def __init__(
3737
parent_container: typing.Optional["Container"] = None,
3838
context: dict[str, typing.Any] | None = None,
3939
use_threading_lock: bool = True,
40-
providers_registry: typing.Optional["ProvidersRegistry"] = None,
40+
providers_registry: ProvidersRegistry | None = None,
4141
) -> None:
4242
self.scope = scope
4343
self.parent_container = parent_container

packages/modern-di/modern_di/helpers/type_helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111

1212

13-
def define_bounded_type(creator: type | object) -> type | None:
13+
def define_bound_type(creator: type | object) -> type | None:
1414
if isinstance(creator, type):
1515
return creator
1616

packages/modern-di/modern_di/providers/abstract.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
from typing_extensions import override
88

99
from modern_di.helpers.attr_getter_helpers import get_value_from_object_by_dotted_path
10+
from modern_di.helpers.type_helpers import define_bound_type
1011
from modern_di.provider_state import ProviderState
11-
from modern_di.helpers.type_helpers import define_bounded_type
1212

1313

1414
T_co = typing.TypeVar("T_co", covariant=True)
@@ -25,14 +25,14 @@ def __init__(
2525
scope: enum.IntEnum,
2626
args: list[typing.Any] | None = None,
2727
kwargs: dict[str, typing.Any] | None = None,
28-
bounded_type: type | None = None,
28+
bound_type: type | None = None,
2929
) -> None:
3030
self.scope = scope
3131
self.provider_id: typing.Final = str(uuid.uuid4())
3232
self._args = args
3333
self._kwargs = kwargs
3434
self.is_async = False
35-
self.bound_type = bounded_type
35+
self.bound_type = bound_type
3636
self._check_providers_scope()
3737

3838
def bind_type(self, new_type: type) -> typing_extensions.Self:
@@ -111,9 +111,10 @@ def __init__(
111111
*args: P.args,
112112
**kwargs: P.kwargs,
113113
) -> None:
114-
super().__init__(scope, args=list(args), kwargs=kwargs, bound_type=define_bounded_type(creator))
114+
super().__init__(scope, args=list(args), kwargs=kwargs, bound_type=define_bound_type(creator))
115115
self._creator: typing.Final = creator
116116

117+
117118
class AttrGetter(AbstractProvider[T_co]):
118119
__slots__ = [*AbstractProvider.BASE_SLOTS, "_attrs"]
119120

packages/modern-di/tests_core/helpers/test_type_helpers.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import typing
22

3-
from modern_di.helpers.type_helpers import define_bounded_type
3+
from modern_di.helpers.type_helpers import define_bound_type
44

55

66
def sync_function() -> int: # pragma: no cover
@@ -28,10 +28,10 @@ def generator_without_args() -> typing.Iterator: # type: ignore[type-arg] # pr
2828

2929

3030
def test_define_bounded_type() -> None:
31-
assert define_bounded_type(int) is int
32-
assert define_bounded_type(sync_function) is int
33-
assert define_bounded_type(async_function) is int
34-
assert define_bounded_type(generator) is int
35-
assert define_bounded_type(async_generator) is int
36-
assert define_bounded_type(collection_function) is None
37-
assert define_bounded_type(generator_without_args) is None
31+
assert define_bound_type(int) is int
32+
assert define_bound_type(sync_function) is int
33+
assert define_bound_type(async_function) is int
34+
assert define_bound_type(generator) is int
35+
assert define_bound_type(async_generator) is int
36+
assert define_bound_type(collection_function) is None
37+
assert define_bound_type(generator_without_args) is None

0 commit comments

Comments
 (0)