ets-labs/python-dependency-injector
1
1
Fork 0
mirror of https://github.com/ets-labs/python-dependency-injector.git synced 2024-11-26 11:33:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix singleton children to have optional provides

Browse Source
This commit is contained in:
Roman Mogylatov 2021-03-06 09:19:26 -05:00
parent ce36033faa
commit bcc0b2ad54
2 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/dependency_injector/providers.c
View File

@ -51651,7 +51651,7 @@ static PyObject *__pyx_pf_19dependency_injector_9providers_13BaseSingleton_34__s
/* "dependency_injector/providers.pyx":2676 /* "dependency_injector/providers.pyx":2676
* """ * """
* *
* def __init__(self, provides, *args, **kwargs): # <<<<<<<<<<<<<< * def __init__(self, provides=None, *args, **kwargs): # <<<<<<<<<<<<<<
* """Initializer. * """Initializer.
* *
*/ */
@ -51688,6 +51688,7 @@ static int __pyx_pw_19dependency_injector_9providers_9Singleton_1__init__(PyObje
{ {
static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_provides,0}; static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_provides,0};
PyObject* values[1] = {0}; PyObject* values[1] = {0};
values[0] = ((PyObject *)Py_None);
if (unlikely(__pyx_kwds)) { if (unlikely(__pyx_kwds)) {
Py_ssize_t kw_args; Py_ssize_t kw_args;
const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args);
@ -51700,23 +51701,26 @@ static int __pyx_pw_19dependency_injector_9providers_9Singleton_1__init__(PyObje
kw_args = PyDict_Size(__pyx_kwds); kw_args = PyDict_Size(__pyx_kwds);
switch (pos_args) { switch (pos_args) {
case 0: case 0:
if (likely((values[0] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_provides)) != 0)) kw_args--; if (kw_args > 0) {
else goto __pyx_L5_argtuple_error; PyObject* value = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_provides);
if (value) { values[0] = value; kw_args--; }
}
} }
if (unlikely(kw_args > 0)) { if (unlikely(kw_args > 0)) {
const Py_ssize_t used_pos_args = (pos_args < 1) ? pos_args : 1; const Py_ssize_t used_pos_args = (pos_args < 1) ? pos_args : 1;
if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, __pyx_v_kwargs, values, used_pos_args, "__init__") < 0)) __PYX_ERR(1, 2676, __pyx_L3_error) if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, __pyx_v_kwargs, values, used_pos_args, "__init__") < 0)) __PYX_ERR(1, 2676, __pyx_L3_error)
} }
} else if (PyTuple_GET_SIZE(__pyx_args) < 1) {
goto __pyx_L5_argtuple_error;
} else { } else {
values[0] = PyTuple_GET_ITEM(__pyx_args, 0); switch (PyTuple_GET_SIZE(__pyx_args)) {
default:
case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);
CYTHON_FALLTHROUGH;
case 0: break;
}
} }
__pyx_v_provides = values[0]; __pyx_v_provides = values[0];
} }
goto __pyx_L4_argument_unpacking_done; goto __pyx_L4_argument_unpacking_done;
__pyx_L5_argtuple_error:;
__Pyx_RaiseArgtupleInvalid("__init__", 0, 1, 1, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(1, 2676, __pyx_L3_error)
__pyx_L3_error:; __pyx_L3_error:;
__Pyx_DECREF(__pyx_v_args); __pyx_v_args = 0; __Pyx_DECREF(__pyx_v_args); __pyx_v_args = 0;
__Pyx_DECREF(__pyx_v_kwargs); __pyx_v_kwargs = 0; __Pyx_DECREF(__pyx_v_kwargs); __pyx_v_kwargs = 0;
@ -51795,7 +51799,7 @@ static int __pyx_pf_19dependency_injector_9providers_9Singleton___init__(struct
/* "dependency_injector/providers.pyx":2676 /* "dependency_injector/providers.pyx":2676
* """ * """
* *
* def __init__(self, provides, *args, **kwargs): # <<<<<<<<<<<<<< * def __init__(self, provides=None, *args, **kwargs): # <<<<<<<<<<<<<<
* """Initializer. * """Initializer.
* *
*/ */
@ -53108,7 +53112,7 @@ static PyObject *__pyx_pf_19dependency_injector_9providers_18DelegatedSingleton_
/* "dependency_injector/providers.pyx":2743 /* "dependency_injector/providers.pyx":2743
* """ * """
* *
* def __init__(self, provides, *args, **kwargs): # <<<<<<<<<<<<<< * def __init__(self, provides=None, *args, **kwargs): # <<<<<<<<<<<<<<
* """Initializer. * """Initializer.
* *
*/ */
@ -53145,6 +53149,7 @@ static int __pyx_pw_19dependency_injector_9providers_19ThreadSafeSingleton_1__in
{ {
static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_provides,0}; static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_provides,0};
PyObject* values[1] = {0}; PyObject* values[1] = {0};
values[0] = ((PyObject *)Py_None);
if (unlikely(__pyx_kwds)) { if (unlikely(__pyx_kwds)) {
Py_ssize_t kw_args; Py_ssize_t kw_args;
const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args);
@ -53157,23 +53162,26 @@ static int __pyx_pw_19dependency_injector_9providers_19ThreadSafeSingleton_1__in
kw_args = PyDict_Size(__pyx_kwds); kw_args = PyDict_Size(__pyx_kwds);
switch (pos_args) { switch (pos_args) {
case 0: case 0:
if (likely((values[0] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_provides)) != 0)) kw_args--; if (kw_args > 0) {
else goto __pyx_L5_argtuple_error; PyObject* value = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_provides);
if (value) { values[0] = value; kw_args--; }
}
} }
if (unlikely(kw_args > 0)) { if (unlikely(kw_args > 0)) {
const Py_ssize_t used_pos_args = (pos_args < 1) ? pos_args : 1; const Py_ssize_t used_pos_args = (pos_args < 1) ? pos_args : 1;
if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, __pyx_v_kwargs, values, used_pos_args, "__init__") < 0)) __PYX_ERR(1, 2743, __pyx_L3_error) if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, __pyx_v_kwargs, values, used_pos_args, "__init__") < 0)) __PYX_ERR(1, 2743, __pyx_L3_error)
} }
} else if (PyTuple_GET_SIZE(__pyx_args) < 1) {
goto __pyx_L5_argtuple_error;
} else { } else {
values[0] = PyTuple_GET_ITEM(__pyx_args, 0); switch (PyTuple_GET_SIZE(__pyx_args)) {
default:
case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);
CYTHON_FALLTHROUGH;
case 0: break;
}
} }
__pyx_v_provides = values[0]; __pyx_v_provides = values[0];
} }
goto __pyx_L4_argument_unpacking_done; goto __pyx_L4_argument_unpacking_done;
__pyx_L5_argtuple_error:;
__Pyx_RaiseArgtupleInvalid("__init__", 0, 1, 1, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(1, 2743, __pyx_L3_error)
__pyx_L3_error:; __pyx_L3_error:;
__Pyx_DECREF(__pyx_v_args); __pyx_v_args = 0; __Pyx_DECREF(__pyx_v_args); __pyx_v_args = 0;
__Pyx_DECREF(__pyx_v_kwargs); __pyx_v_kwargs = 0; __Pyx_DECREF(__pyx_v_kwargs); __pyx_v_kwargs = 0;
@ -53270,7 +53278,7 @@ static int __pyx_pf_19dependency_injector_9providers_19ThreadSafeSingleton___ini
/* "dependency_injector/providers.pyx":2743 /* "dependency_injector/providers.pyx":2743
* """ * """
* *
* def __init__(self, provides, *args, **kwargs): # <<<<<<<<<<<<<< * def __init__(self, provides=None, *args, **kwargs): # <<<<<<<<<<<<<<
* """Initializer. * """Initializer.
* *
*/ */
@ -54907,7 +54915,7 @@ static PyObject *__pyx_pf_19dependency_injector_9providers_28DelegatedThreadSafe
/* "dependency_injector/providers.pyx":2826 /* "dependency_injector/providers.pyx":2826
* """ * """
* *
* def __init__(self, provides, *args, **kwargs): # <<<<<<<<<<<<<< * def __init__(self, provides=None, *args, **kwargs): # <<<<<<<<<<<<<<
* """Initializer. * """Initializer.
* *
*/ */
@ -54944,6 +54952,7 @@ static int __pyx_pw_19dependency_injector_9providers_20ThreadLocalSingleton_1__i
{ {
static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_provides,0}; static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_provides,0};
PyObject* values[1] = {0}; PyObject* values[1] = {0};
values[0] = ((PyObject *)Py_None);
if (unlikely(__pyx_kwds)) { if (unlikely(__pyx_kwds)) {
Py_ssize_t kw_args; Py_ssize_t kw_args;
const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args);
@ -54956,23 +54965,26 @@ static int __pyx_pw_19dependency_injector_9providers_20ThreadLocalSingleton_1__i
kw_args = PyDict_Size(__pyx_kwds); kw_args = PyDict_Size(__pyx_kwds);
switch (pos_args) { switch (pos_args) {
case 0: case 0:
if (likely((values[0] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_provides)) != 0)) kw_args--; if (kw_args > 0) {
else goto __pyx_L5_argtuple_error; PyObject* value = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_provides);
if (value) { values[0] = value; kw_args--; }
}
} }
if (unlikely(kw_args > 0)) { if (unlikely(kw_args > 0)) {
const Py_ssize_t used_pos_args = (pos_args < 1) ? pos_args : 1; const Py_ssize_t used_pos_args = (pos_args < 1) ? pos_args : 1;
if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, __pyx_v_kwargs, values, used_pos_args, "__init__") < 0)) __PYX_ERR(1, 2826, __pyx_L3_error) if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, __pyx_v_kwargs, values, used_pos_args, "__init__") < 0)) __PYX_ERR(1, 2826, __pyx_L3_error)
} }
} else if (PyTuple_GET_SIZE(__pyx_args) < 1) {
goto __pyx_L5_argtuple_error;
} else { } else {
values[0] = PyTuple_GET_ITEM(__pyx_args, 0); switch (PyTuple_GET_SIZE(__pyx_args)) {
default:
case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);
CYTHON_FALLTHROUGH;
case 0: break;
}
} }
__pyx_v_provides = values[0]; __pyx_v_provides = values[0];
} }
goto __pyx_L4_argument_unpacking_done; goto __pyx_L4_argument_unpacking_done;
__pyx_L5_argtuple_error:;
__Pyx_RaiseArgtupleInvalid("__init__", 0, 1, 1, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(1, 2826, __pyx_L3_error)
__pyx_L3_error:; __pyx_L3_error:;
__Pyx_DECREF(__pyx_v_args); __pyx_v_args = 0; __Pyx_DECREF(__pyx_v_args); __pyx_v_args = 0;
__Pyx_DECREF(__pyx_v_kwargs); __pyx_v_kwargs = 0; __Pyx_DECREF(__pyx_v_kwargs); __pyx_v_kwargs = 0;
@ -55071,7 +55083,7 @@ static int __pyx_pf_19dependency_injector_9providers_20ThreadLocalSingleton___in
/* "dependency_injector/providers.pyx":2826 /* "dependency_injector/providers.pyx":2826
* """ * """
* *
* def __init__(self, provides, *args, **kwargs): # <<<<<<<<<<<<<< * def __init__(self, provides=None, *args, **kwargs): # <<<<<<<<<<<<<<
* """Initializer. * """Initializer.
* *
*/ */

6
src/dependency_injector/providers.pyx
View File

@ -2673,7 +2673,7 @@ cdef class Singleton(BaseSingleton):
:type: type :type: type
""" """
def __init__(self, provides, *args, **kwargs): def __init__(self, provides=None, *args, **kwargs):
"""Initializer. """Initializer.
:param provides: Provided type. :param provides: Provided type.
@ -2740,7 +2740,7 @@ cdef class ThreadSafeSingleton(BaseSingleton):
:type: :py:class:`threading.RLock` :type: :py:class:`threading.RLock`
""" """
def __init__(self, provides, *args, **kwargs): def __init__(self, provides=None, *args, **kwargs):
"""Initializer. """Initializer.
:param provides: Provided type. :param provides: Provided type.
@ -2823,7 +2823,7 @@ cdef class ThreadLocalSingleton(BaseSingleton):
:type: type :type: type
""" """
def __init__(self, provides, *args, **kwargs): def __init__(self, provides=None, *args, **kwargs):
"""Initializer. """Initializer.
:param provides: Provided type. :param provides: Provided type.