Fix Python 3.6 tests and flake8

Author: rmk135

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,

tests/unit/samples/wiringsamples/module.py

@@ -11,15 +11,15 @@
 
 
 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]):

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 @@
 
 
 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']):