mirror of
https://github.com/ets-labs/python-dependency-injector.git
synced 2025-02-11 09:00:57 +03:00
Remove typing erros in Python 2.7 and 3.4
This commit is contained in:
parent
b7762f99e8
commit
6e9dae52ca
File diff suppressed because it is too large
Load Diff
|
@ -39,7 +39,6 @@ from .errors import (
|
||||||
Error,
|
Error,
|
||||||
NoSuchProviderError,
|
NoSuchProviderError,
|
||||||
)
|
)
|
||||||
from . import resources
|
|
||||||
|
|
||||||
cimport cython
|
cimport cython
|
||||||
|
|
||||||
|
@ -2707,7 +2706,7 @@ cdef class Resource(Provider):
|
||||||
if self.__initialized:
|
if self.__initialized:
|
||||||
return self.__resource
|
return self.__resource
|
||||||
|
|
||||||
if isinstance(self.__initializer, resources.Resource):
|
if _is_resource(self.__initializer):
|
||||||
initializer = self.__initializer()
|
initializer = self.__initializer()
|
||||||
self.__resource = __call(
|
self.__resource = __call(
|
||||||
initializer.init,
|
initializer.init,
|
||||||
|
@ -3358,3 +3357,10 @@ def merge_dicts(dict1, dict2):
|
||||||
result = dict1.copy()
|
result = dict1.copy()
|
||||||
result.update(dict2)
|
result.update(dict2)
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
def _is_resource(instance):
|
||||||
|
if sys.version_info < (3, 5):
|
||||||
|
return False
|
||||||
|
from . import resources
|
||||||
|
return isinstance(instance, resources.Resource)
|
Loading…
Reference in New Issue
Block a user