Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions injection/_core/module.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,12 @@ def __str__(self) -> str:
)


@dataclass(frozen=True, slots=True)
class UnlockCalled(Event):
def __str__(self) -> str:
return "An `unlock` method has been called."


"""
Broker
"""
Expand Down Expand Up @@ -802,8 +808,11 @@ def change_priority(self, module: Module, priority: Priority | PriorityStr) -> S
return self

def unlock(self) -> Self:
for broker in self.__brokers:
broker.unlock()
event = UnlockCalled()

with self.dispatch(event, lock_bypass=True):
Comment thread
remimd marked this conversation as resolved.
for broker in self.__brokers:
broker.unlock()

return self

Expand Down Expand Up @@ -838,20 +847,20 @@ def remove_listener(self, listener: EventListener) -> Self:
self.__channel.remove_listener(listener)
return self

def on_event(self, event: Event, /) -> ContextManager[None] | None:
def on_event(self, event: Event, /) -> ContextManager[None]:
self_event = ModuleEventProxy(self, event)
return self.dispatch(self_event)

@contextmanager
def dispatch(self, event: Event) -> Iterator[None]:
self.__check_locking()
def dispatch(self, event: Event, *, lock_bypass: bool = False) -> Iterator[None]:
if not lock_bypass:
self.__check_locking()

with self.__channel.dispatch(event):
try:
yield
finally:
message = str(event)
self.__debug(message)
self.__debug(event)

def __debug(self, message: object) -> None:
for logger in self.__loggers:
Expand Down
16 changes: 16 additions & 0 deletions tests/core/test_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,22 @@ class C(A): ...
assert isinstance(b1.a, A)
assert isinstance(b2.a, C)

def test_unlock_with_module_in_use_raise_module_lock_error(self, module):
second_module = Module()
module.use(second_module)

@module.singleton
class A: ...

@second_module.singleton
class B: ...

module.get_instance(A)
second_module.get_instance(B)

with pytest.raises(ModuleLockError):
second_module.unlock()

def test_unlock_with_scoped_dependency(self, module):
@module.scoped("test")
class Dependency: ...
Expand Down