Skip to content
Snippets Groups Projects
Commit eaef4b5d authored by Dmitry Puzyrkov's avatar Dmitry Puzyrkov
Browse files

Merge branch 'master' into feature-13362

parents a8b992e1 f953c531
2 merge requests!430Develop port 02 12,!418added atom confirmed notifier
Subproject commit 1ec41004a5e508c6d250ebc0d67c9e52a2aa76bc Subproject commit 8477d1c289c036a9c2cc41471285a19d244e5e80
...@@ -83,7 +83,8 @@ PyObject *dap_chain_load_from_cfg_py(PyObject *self, PyObject *args){ ...@@ -83,7 +83,8 @@ PyObject *dap_chain_load_from_cfg_py(PyObject *self, PyObject *args){
if (!PyArg_ParseTuple(args, "s|O|s", &chain_net_name, &obj_net_id, &cfg_name)) if (!PyArg_ParseTuple(args, "s|O|s", &chain_net_name, &obj_net_id, &cfg_name))
return NULL; return NULL;
PyObject *res_obj = _PyObject_New(&DapChainObjectType); PyObject *res_obj = _PyObject_New(&DapChainObjectType);
((PyDapChainObject*)res_obj)->chain_t = dap_chain_load_from_cfg(chain_net_name, ((PyDapChainNetIdObject*)obj_net_id)->net_id, cfg_name); dap_config_t *l_chain_config = dap_config_open(cfg_name);
((PyDapChainObject*)res_obj)->chain_t = dap_chain_load_from_cfg(chain_net_name, ((PyDapChainNetIdObject*)obj_net_id)->net_id, l_chain_config);
return Py_BuildValue("O", &res_obj); return Py_BuildValue("O", &res_obj);
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
static PyGetSetDef PyDapJSONRPCResponseGetsSets[] = { static PyGetSetDef PyDapJSONRPCResponseGetsSets[] = {
{"ID", (getter)wrapping_json_rpc_response_get_id, NULL, "ID request", NULL}, {"ID", (getter)wrapping_json_rpc_response_get_id, NULL, "ID request", NULL},
{"Error", (getter)wrapping_json_rpc_response_get_error, (setter)wrapping_json_rpc_response_set_error, "", NULL }, // {"Error", (getter)wrapping_json_rpc_response_get_error, (setter)wrapping_json_rpc_response_set_error, "", NULL },
{"Result", (getter)wrapping_json_rpc_response_get_result, (setter)wrapping_json_rpc_response_set_result, "", NULL}, {"Result", (getter)wrapping_json_rpc_response_get_result, (setter)wrapping_json_rpc_response_set_result, "", NULL},
{} {}
}; };
...@@ -73,20 +73,20 @@ PyObject *wrapping_json_rpc_response_get_result(PyObject *self, void *closure){ ...@@ -73,20 +73,20 @@ PyObject *wrapping_json_rpc_response_get_result(PyObject *self, void *closure){
} }
Py_RETURN_NONE; Py_RETURN_NONE;
} }
PyObject *wrapping_json_rpc_response_get_error(PyObject *self, void *closure){ // PyObject *wrapping_json_rpc_response_get_error(PyObject *self, void *closure){
UNUSED(closure); // UNUSED(closure);
dap_json_rpc_response_t* l_resp = ((PyDapJSONRPCResponseObject*)self)->response; // dap_json_rpc_response_t* l_resp = ((PyDapJSONRPCResponseObject*)self)->response;
if (l_resp->json_arr_errors) { // if (l_resp->json_arr_errors) {
for (size_t i = 0; i < json_object_array_length(l_resp->json_arr_errors); i++) { // for (size_t i = 0; i < json_object_array_length(l_resp->json_arr_errors); i++) {
json_object * a_jobj = json_object_array_get_idx(l_resp->json_arr_errors, i); // json_object * a_jobj = json_object_array_get_idx(l_resp->json_arr_errors, i);
json_object *l_jobj_code_eror = json_object_object_get(a_jobj, "code"); // json_object *l_jobj_code_eror = json_object_object_get(a_jobj, "code");
json_object *l_jobj_msg = json_object_object_get(a_jobj, "message"); // json_object *l_jobj_msg = json_object_object_get(a_jobj, "message");
//TODO make a touple return // //TODO make a touple return
return Py_BuildValue("is", json_object_get_string(l_jobj_code_eror), json_object_get_string(l_jobj_msg)); // return Py_BuildValue("is", json_object_get_string(l_jobj_code_eror), json_object_get_string(l_jobj_msg));
} // }
} // }
return PyTuple_New(2); // return PyTuple_New(2);
} // }
int wrapping_json_rpc_response_set_error(PyObject *self, PyObject *args, void *closure){ int wrapping_json_rpc_response_set_error(PyObject *self, PyObject *args, void *closure){
UNUSED(closure); UNUSED(closure);
......
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