From 9727b4924e130525b91bc41484f598dbb9eb1dda Mon Sep 17 00:00:00 2001 From: Roman Mogilatov Date: Tue, 15 Nov 2016 14:19:17 +0200 Subject: [PATCH 1/2] Remove providers/utils.h --- .gitignore | 4 +++ src/dependency_injector/providers/utils.c | 3 +- src/dependency_injector/providers/utils.h | 31 --------------------- src/dependency_injector/providers/utils.pxd | 2 +- 4 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 src/dependency_injector/providers/utils.h diff --git a/.gitignore b/.gitignore index ed81f604..8337b46c 100644 --- a/.gitignore +++ b/.gitignore @@ -63,5 +63,9 @@ venv/ .ropeproject/ # C extensions +src/dependency_injector/*.h src/dependency_injector/*.so +src/dependency_injector/containers/*.h +src/dependency_injector/containers/*.so +src/dependency_injector/providers/*.h src/dependency_injector/providers/*.so diff --git a/src/dependency_injector/providers/utils.c b/src/dependency_injector/providers/utils.c index 4cbf6e99..99e478c0 100644 --- a/src/dependency_injector/providers/utils.c +++ b/src/dependency_injector/providers/utils.c @@ -975,7 +975,7 @@ static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); /* Module declarations from 'dependency_injector.providers.utils' */ -__PYX_EXTERN_C DL_EXPORT(PyObject) *__pyx_v_19dependency_injector_9providers_5utils_CLASS_TYPES; +static PyObject *__pyx_v_19dependency_injector_9providers_5utils_CLASS_TYPES = 0; static int __pyx_f_19dependency_injector_9providers_5utils_is_provider(PyObject *, int __pyx_skip_dispatch); /*proto*/ static PyObject *__pyx_f_19dependency_injector_9providers_5utils_ensure_is_provider(PyObject *, int __pyx_skip_dispatch); /*proto*/ static int __pyx_f_19dependency_injector_9providers_5utils_is_delegated(PyObject *, int __pyx_skip_dispatch); /*proto*/ @@ -1313,7 +1313,6 @@ static PyObject *__pyx_lambda_funcdef_19dependency_injector_9providers_5utils_la __Pyx_RefNannyFinishContext(); return __pyx_r; } -PyObject *__pyx_v_19dependency_injector_9providers_5utils_CLASS_TYPES = 0; /* "dependency_injector/providers/utils.pyx":25 * diff --git a/src/dependency_injector/providers/utils.h b/src/dependency_injector/providers/utils.h deleted file mode 100644 index 00f08d98..00000000 --- a/src/dependency_injector/providers/utils.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated by Cython 0.25.1 */ - -#ifndef __PYX_HAVE__dependency_injector__providers__utils -#define __PYX_HAVE__dependency_injector__providers__utils - - -#ifndef __PYX_HAVE_API__dependency_injector__providers__utils - -#ifndef __PYX_EXTERN_C - #ifdef __cplusplus - #define __PYX_EXTERN_C extern "C" - #else - #define __PYX_EXTERN_C extern - #endif -#endif - -#ifndef DL_IMPORT - #define DL_IMPORT(_T) _T -#endif - -__PYX_EXTERN_C DL_IMPORT(PyObject) *__pyx_v_19dependency_injector_9providers_5utils_CLASS_TYPES; - -#endif /* !__PYX_HAVE_API__dependency_injector__providers__utils */ - -#if PY_MAJOR_VERSION < 3 -PyMODINIT_FUNC initutils(void); -#else -PyMODINIT_FUNC PyInit_utils(void); -#endif - -#endif /* !__PYX_HAVE__dependency_injector__providers__utils */ diff --git a/src/dependency_injector/providers/utils.pxd b/src/dependency_injector/providers/utils.pxd index 84faf5ba..8c4b49a9 100644 --- a/src/dependency_injector/providers/utils.pxd +++ b/src/dependency_injector/providers/utils.pxd @@ -3,7 +3,7 @@ Powered by Cython. """ -cdef public object CLASS_TYPES +cdef object CLASS_TYPES cpdef bint is_provider(object instance) From 2072567242508349e62f0582ebe7ddd114b64a98 Mon Sep 17 00:00:00 2001 From: Roman Mogilatov Date: Tue, 15 Nov 2016 14:26:40 +0200 Subject: [PATCH 2/2] Fix flake8 E305 error --- examples/containers/declarative.py | 1 + examples/miniapps/movie_lister/app_db_csv.py | 1 + examples/providers/overriding_simple.py | 2 ++ examples/providers/overriding_users_model.py | 2 ++ 4 files changed, 6 insertions(+) diff --git a/examples/containers/declarative.py b/examples/containers/declarative.py index 2e5fb421..f095d5e9 100644 --- a/examples/containers/declarative.py +++ b/examples/containers/declarative.py @@ -12,6 +12,7 @@ class Container(containers.DeclarativeContainer): factory2 = providers.Factory(object) + # Creating some objects: object1 = Container.factory1() object2 = Container.factory2() diff --git a/examples/miniapps/movie_lister/app_db_csv.py b/examples/miniapps/movie_lister/app_db_csv.py index b224ba40..2f2864d8 100644 --- a/examples/miniapps/movie_lister/app_db_csv.py +++ b/examples/miniapps/movie_lister/app_db_csv.py @@ -71,6 +71,7 @@ class CsvApplication(containers.DeclarativeContainer): csv_file_path=settings.MOVIES_CSV_PATH, delimiter=',') + if __name__ == '__main__': DbApplication.init_db() DbApplication.main() diff --git a/examples/providers/overriding_simple.py b/examples/providers/overriding_simple.py index d68dd5f0..77a5a6d0 100644 --- a/examples/providers/overriding_simple.py +++ b/examples/providers/overriding_simple.py @@ -6,6 +6,7 @@ import dependency_injector.providers as providers class User(object): """Example class User.""" + # Users factory: users_factory = providers.Factory(User) @@ -22,6 +23,7 @@ assert isinstance(user1, User) and isinstance(user2, User) class SuperUser(User): """Example class SuperUser.""" + # Overriding users factory: users_factory.override(providers.Factory(SuperUser)) diff --git a/examples/providers/overriding_users_model.py b/examples/providers/overriding_users_model.py index 84394118..b3ab2adc 100644 --- a/examples/providers/overriding_users_model.py +++ b/examples/providers/overriding_users_model.py @@ -25,6 +25,7 @@ class UsersService(object): """Find user by his id and return user model.""" return self.user_cls(id=id, password='secret' + str(id)) + # Users factory and UsersService provider: users_service = providers.Factory(UsersService, user_cls=User) @@ -69,6 +70,7 @@ class ExtendedUsersService(UsersService): user.gender = 'male' return user + # Overriding users_service provider: extended_users_service = providers.Factory(ExtendedUsersService, user_cls=ExtendedUser)