Skip to content
Snippets Groups Projects
Commit 95b0fc28 authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

Merge branch 'bugs-3310' into 'master'

Bugs 3310 - Fixed typo in checking logging level during plugin initialization. Added a call to the PyType_Ready function, which adds inherited slots from the base class for the CryptoCert object.

See merge request !11
parents 72321f76 11996ad8
No related branches found
No related tags found
1 merge request!11Bugs 3310 - Fixed typo in checking logging level during plugin initialization. Added a call to the PyType_Ready function, which adds inherited slots from the base class for the CryptoCert object.
Subproject commit 7673a49aa07982dbdb148412eca5f4603e23658c
Subproject commit f63cbb61e8afa337229c60f61e63495e6552ff13
Subproject commit bc4970d5d7d498bdf521d82e63585badc54fdca5
Subproject commit 5454f04279c2918957ae1f8222804971a7db9a1a
......@@ -107,7 +107,7 @@ PyObject *python_cellframe_init(PyObject *self, PyObject *args){
dap_log_level_set(L_WARNING);
}else if ( dap_strcmp( log_level, "L_ATT" )==0 || dap_strcmp( log_level, "ATTENTION" )==0 ){
dap_log_level_set(L_ATT);
}else if ( dap_strcmp( log_level, "ERROR" )==0 || dap_strcmp( log_level, "ERROR" )==0 ){
}else if ( dap_strcmp( log_level, "L_ERROR" )==0 || dap_strcmp( log_level, "ERROR" )==0 ){
dap_log_level_set(L_ERROR);
}else if ( dap_strcmp( log_level, "L_CRITICAL" )==0 || dap_strcmp( log_level, "CRITICAL" )==0 ){
dap_log_level_set(L_CRITICAL);
......@@ -328,7 +328,8 @@ PyObject *python_cellframe_init(PyObject *self, PyObject *args){
PyMODINIT_FUNC PyInit_libCellFrame(void){
if (PyType_Ready(&DapCoreObjectType) < 0 || PyType_Ready(&dapCrypto_dapCryptoType) < 0 ||
PyType_Ready(&ServerCore_ServerCoreType) < 0 || PyType_Ready(&dapEvents_dapEventsType) < 0 ||
PyType_Ready(&dapCrypto_dapCryptoCertType) < 0 ||
PyType_Ready(&ServerCore_ServerCoreType) < 0 || PyType_Ready(&dapEvents_dapEventsType) < 0 ||
PyType_Ready(&dapEventsSocket_dapEventsSocketType) < 0 ||
PyType_Ready(&CryptoKeyTypeObjecy_CryptoKeyTypeObjecyType) < 0 ||
PyType_Ready(&CryptoDataTypeObjecy_CryptoDataTypeObjecyType) < 0 ||
......@@ -409,7 +410,7 @@ PyMODINIT_FUNC PyInit_libCellFrame(void){
PyModule_AddObject(module, "ChainType", (PyObject*)&dapChainTypeObject_dapChainTypeType);
PyModule_AddObject(module, "ChainAtomIter", (PyObject*)&dapChainAtomPtr_dapChainAtomPtrType);
PyModule_AddObject(module, "ChainCell", (PyObject*)&DapChainCell_DapChainCellObjectType);
//// PyModule_AddObject(module, "ChainCommon", (PyObject*)&ChainCommonObject_ChainCommonType);
// PyModule_AddObject(module, "ChainCommon", (PyObject*)&ChainCommonObject_ChainCommonType);
// PyModule_AddObject(module, "ChainID", (PyObject*)&DapChainIDObject_DapChainIDType);
PyModule_AddObject(module, "ChainCellID", (PyObject*)&DapChainCellIDObject_DapChainCellIDType);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment