comp-chem/NWChem
1
0
Fork 0
mirror of https://github.com/nwchemgit/nwchem.git synced 2026-07-28 06:05:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix wrap_rtdb_put(...,CHAR) for python3

Browse source
This commit is contained in:
edoapra 2023-10-09 17:16:54 -07:00
parent 52ec936678
commit 8677f3ef3b
No known key found for this signature in database
GPG key ID: 48E12DA1EDE9E1B0
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/python/nwchem_wrap.c
View file

@ -199,9 +199,12 @@ static int check_type(PyObject *obj)
char *Parse_String(PyObject *arg)
{
char *out;
PyObject *ascii_string;
if (PyUnicode_Check(arg)) {
ascii_string = PyUnicode_AsASCIIString(arg);
PyObject* ascii_string = PyUnicode_AsASCIIString(arg);
if (NULL == ascii_string ) {
PyErr_SetString(PyExc_TypeError, "PyUnicode_AsASCIIString failed");
return NULL;
}
out = PyBytes_AsString(ascii_string);
Py_DECREF(ascii_string);
} else if (PyBytes_Check(arg)) {
@ -294,7 +297,6 @@ static PyObject *wrap_rtdb_put(PyObject *self, PyObject *args)
void *array = 0;
PyObject *obj, *option_obj;
name = Parse_String(PyTuple_GetItem(args, 0));
obj = PyTuple_GetItem(args, 1);
if (PyList_Check(obj))
@ -405,6 +407,7 @@ static PyObject *wrap_rtdb_put(PyObject *self, PyObject *args)
break;
}
name = Parse_String(PyTuple_GetItem(args, 0));
if (!(rtdb_put(rtdb_handle, name, ma_type, list_len, array))) {
PyErr_SetString(NwchemError, "rtdb_put failed");
if ((ma_type != MT_CHAR) && array) free(array);
@ -1838,6 +1841,10 @@ void initnwchem()
#endif
if (module == NULL)
INITERROR;
NwchemError = PyErr_NewException("nwchem.NwchemError", NULL, NULL);
PyModule_AddObject(module, "NwchemError", NwchemError);
struct module_state *st = GETSTATE(module);
st->error = PyErr_NewException("nwchem.error", NULL, NULL);
if (st->error == NULL) {