python-injection 0.8.4.post2__tar.gz → 0.8.5__tar.gz

{python_injection-0.8.4.post2 → python_injection-0.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-injection
-Version: 0.8.4.post2
+Version: 0.8.5
 Summary: Fast and easy dependency injection framework.
 Home-page: https://github.com/100nm/python-injection
 License: MIT

{python_injection-0.8.4.post2 → python_injection-0.8.5}/injection/core/module.py

@@ -17,6 +17,7 @@ from dataclasses import dataclass, field
 from enum import Enum
 from functools import partialmethod, singledispatchmethod, update_wrapper
 from inspect import Signature, isclass
+from queue import Queue
 from types import MethodType, UnionType
 from typing import (
     Any,
@@ -33,7 +34,6 @@ from typing import (
 from injection.common.event import Event, EventChannel, EventListener
 from injection.common.invertible import Invertible, SimpleInvertible
 from injection.common.lazy import Lazy, LazyMapping
-from injection.common.queue import LimitedQueue
 from injection.common.tools.threading import synchronized
 from injection.common.tools.type import find_types, format_type, get_origins
 from injection.exceptions import (
@@ -51,7 +51,6 @@ _logger = logging.getLogger(__name__)
 _T = TypeVar("_T")
 _T_co = TypeVar("_T_co", covariant=True)
 
-
 """
 Events
 """
@@ -684,8 +683,10 @@ class InjectedFunction(EventListener):
         update_wrapper(self, wrapped, updated=())
         self.__dependencies = Dependencies.empty()
         self.__owner = None
-        self.__setup_queue = LimitedQueue[Callable[[], Any]]()
-        self.on_setup(self.__set_signature)
+
+        queue = Queue[Callable[[], Any]]()
+        queue.put_nowait(self.__set_signature)
+        self.__setup_queue = queue
 
     def __repr__(self) -> str:  # pragma: no cover
         return repr(self.wrapped)
@@ -694,8 +695,12 @@ class InjectedFunction(EventListener):
         return str(self.wrapped)
 
     def __call__(self, /, *args, **kwargs) -> Any:
-        for function in self.__setup_queue:
-            function()
+        queue = self.__setup_queue
+
+        while not queue.empty():
+            setup = queue.get()
+            setup()
+            queue.task_done()
 
         arguments = self.bind(args, kwargs)
         return self.wrapped(*arguments.args, **arguments.kwargs)
@@ -753,7 +758,7 @@ class InjectedFunction(EventListener):
 
     def on_setup(self, wrapped: Callable[[], Any] = None, /):
         def decorator(wp):
-            self.__setup_queue.add(wp)
+            self.__setup_queue.put(wp)
             return wp
 
         return decorator(wrapped) if wrapped else decorator
@@ -781,12 +786,15 @@ class InjectedFunction(EventListener):
             self.__update_vars(variables)
 
     def __update_vars(self, variables: Mapping[str, Any]):
-        def is_dunder(var: str) -> bool:
-            return var.startswith("__") and var.endswith("__")
-
-        restricted_vars = frozenset(var for var in dir(self) if not is_dunder(var))
+        restricted_vars = frozenset(
+            var for var in dir(self) if not self.__is_dunder(var)
+        )
         vars(self).update(
             (var, value)
             for var, value in variables.items()
             if var not in restricted_vars
         )
+
+    @staticmethod
+    def __is_dunder(var: str) -> bool:
+        return var.startswith("__") and var.endswith("__")

{python_injection-0.8.4.post2 → python_injection-0.8.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-injection"
-version = "0.8.4.post2"
+version = "0.8.5"
 description = "Fast and easy dependency injection framework."
 authors = ["remimd"]
 keywords = ["dependencies", "inject", "injection"]

python_injection-0.8.4.post2/injection/common/queue.py

@@ -1,63 +0,0 @@
-from abc import abstractmethod
-from collections import deque
-from collections.abc import Iterator
-from dataclasses import dataclass, field
-from typing import NoReturn, Protocol, TypeVar
-
-__all__ = ("LimitedQueue",)
-
-_T = TypeVar("_T")
-
-
-class Queue(Iterator[_T], Protocol):
-    __slots__ = ()
-
-    @abstractmethod
-    def add(self, item: _T):
-        raise NotImplementedError
-
-
-@dataclass(repr=False, frozen=True, slots=True)
-class SimpleQueue(Queue[_T]):
-    __items: deque[_T] = field(default_factory=deque, init=False)
-
-    def __next__(self) -> _T:
-        try:
-            return self.__items.popleft()
-        except IndexError as exc:
-            raise StopIteration from exc
-
-    def add(self, item: _T):
-        self.__items.append(item)
-        return self
-
-
-class DeadQueue(Queue[_T]):
-    __slots__ = ()
-
-    def __bool__(self) -> bool:
-        return False
-
-    def __next__(self) -> NoReturn:
-        raise StopIteration
-
-    def add(self, item: _T) -> NoReturn:
-        raise TypeError("Queue is dead.")
-
-
-@dataclass(repr=False, slots=True)
-class LimitedQueue(Queue[_T]):
-    __state: Queue[_T] = field(default_factory=SimpleQueue)
-
-    def __next__(self) -> _T:
-        try:
-            return next(self.__state)
-        except StopIteration as exc:
-            if self.__state:
-                self.__state = DeadQueue()
-
-            raise exc
-
-    def add(self, item: _T):
-        self.__state.add(item)
-        return self