diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2018-08-16 09:16:53 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2018-08-16 09:16:53 (GMT) |
commit | fb315963527f6412273829f09513325e446eb6c9 (patch) | |
tree | 361f19767812a8f758545e8daa2973fe0b3c9de7 /plugins/pychrysalide/common/module.c | |
parent | 36945bffa2ca648b58c99905ebf9b1b536a9188a (diff) |
Reorganized the Python plugin code.
Diffstat (limited to 'plugins/pychrysalide/common/module.c')
-rw-r--r-- | plugins/pychrysalide/common/module.c | 57 |
1 files changed, 28 insertions, 29 deletions
diff --git a/plugins/pychrysalide/common/module.c b/plugins/pychrysalide/common/module.c index 7ff7528..9df257e 100644 --- a/plugins/pychrysalide/common/module.c +++ b/plugins/pychrysalide/common/module.c @@ -28,27 +28,26 @@ #include "bits.h" #include "fnv1a.h" #include "pathname.h" -#include "../access.h" +#include "../helpers.h" /****************************************************************************** * * -* Paramètres : module = module dont la définition est à compléter. * +* Paramètres : super = module dont la définition est à compléter. * * * -* Description : Ajoute le module 'common' au module Python. * +* Description : Ajoute le module 'common' à un module Python. * * * -* Retour : - * +* Retour : Bilan de l'opération. * * * * Remarques : - * * * ******************************************************************************/ -bool add_common_module_to_python_module(PyObject *super) +bool add_common_module(PyObject *super) { bool result; /* Bilan à retourner */ PyObject *module; /* Sous-module mis en place */ - int ret; /* Bilan d'un appel */ static PyModuleDef py_chrysalide_common_module = { @@ -61,38 +60,38 @@ bool add_common_module_to_python_module(PyObject *super) }; - result = false; + module = build_python_module(super, &py_chrysalide_common_module); - module = PyModule_Create(&py_chrysalide_common_module); - if (module == NULL) return false; + result = (module != NULL); - ret = PyState_AddModule(super, &py_chrysalide_common_module); - if (ret != 0) goto acmtpm_exit; - - ret = _PyImport_FixupBuiltin(module, "pychrysalide.common"); - if (ret != 0) goto acmtpm_exit; + return result; - Py_INCREF(module); - ret = PyModule_AddObject(super, "common", module); - if (ret != 0) goto acmtpm_exit; +} - result = true; - result &= register_python_bitfield(module); - result &= register_python_fnv1a(module); - result &= register_python_pathname(module); +/****************************************************************************** +* * +* Paramètres : - * +* * +* Description : Intègre les objets du module 'common'. * +* * +* Retour : Bilan de l'opération. * +* * +* Remarques : - * +* * +******************************************************************************/ - if (result) - register_access_to_python_module("pychrysalide.common", module); +bool populate_common_module(void) +{ + bool result; /* Bilan à retourner */ - acmtpm_exit: + result = true; - if (!result) - { - printf("something went wrong in %s...\n", __FUNCTION__); - /* ... */ + if (result) result = ensure_python_bitfield_is_registered(); + if (result) result = ensure_python_fnv1a_is_registered(); + if (result) result = ensure_python_pathname_is_registered(); - } + assert(result); return result; |