From 9f6d236fdfa4d5098bfe927c56f98251873a2d15 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Sun, 28 Feb 2021 21:03:15 -0500 Subject: [PATCH] Fix Python 3.6 tests and flake8 --- src/dependency_injector/wiring.py | 2 +- tests/unit/samples/wiringsamples/module.py | 8 ++++---- tests/unit/samples/wiringstringidssamples/module.py | 9 ++++----- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/dependency_injector/wiring.py b/src/dependency_injector/wiring.py index 0eb1a6ac..222e0d63 100644 --- a/src/dependency_injector/wiring.py +++ b/src/dependency_injector/wiring.py @@ -350,7 +350,7 @@ def wire( # noqa: C901 _bind_injections(patched, providers_map) -def unwire( +def unwire( # noqa: C901 *, modules: Optional[Iterable[ModuleType]] = None, packages: Optional[Iterable[ModuleType]] = None, diff --git a/tests/unit/samples/wiringsamples/module.py b/tests/unit/samples/wiringsamples/module.py index c61b27b9..333de332 100644 --- a/tests/unit/samples/wiringsamples/module.py +++ b/tests/unit/samples/wiringsamples/module.py @@ -11,15 +11,15 @@ from .service import Service service: Service = Provide[Container.service] -service_provider: providers.Provider[Service] = Provider[Container.service] -undefined: providers.Provider = Provide[providers.Provider()] +service_provider: Callable[..., Service] = Provider[Container.service] +undefined: Callable = Provide[providers.Provider()] class TestClass: service: Service = Provide[Container.service] - service_provider: providers.Provider[Service] = Provider[Container.service] - undefined: providers.Provider = Provide[providers.Provider()] + service_provider: Callable[..., Service] = Provider[Container.service] + undefined: Callable = Provide[providers.Provider()] @inject def __init__(self, service: Service = Provide[Container.service]): diff --git a/tests/unit/samples/wiringstringidssamples/module.py b/tests/unit/samples/wiringstringidssamples/module.py index 159237c7..e56b7892 100644 --- a/tests/unit/samples/wiringstringidssamples/module.py +++ b/tests/unit/samples/wiringstringidssamples/module.py @@ -3,7 +3,6 @@ from decimal import Decimal from typing import Callable -from dependency_injector import providers from dependency_injector.wiring import ( inject, Provide, @@ -21,15 +20,15 @@ from .service import Service service: Service = Provide['service'] -service_provider: providers.Provider[Service] = Provider['service'] -undefined: providers.Provider = Provide['undefined'] +service_provider: Callable[..., Service] = Provider['service'] +undefined: Callable = Provide['undefined'] class TestClass: service: Service = Provide['service'] - service_provider: providers.Provider[Service] = Provider['service'] - undefined: providers.Provider = Provide['undefined'] + service_provider: Callable[..., Service] = Provider['service'] + undefined: Callable = Provide['undefined'] @inject def __init__(self, service: Service = Provide['service']):