* This file is part of the sigrok project.
*
* Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
int ret;
if (!PyObject_HasAttrString(py_obj, attr)) {
- srd_dbg("srd: %s object has no attribute '%s'.",
- Py_TYPE(py_obj)->tp_name, attr);
+ srd_dbg("%s object has no attribute '%s'.",
+ Py_TYPE(py_obj)->tp_name, attr);
return SRD_ERR_PYTHON;
}
if (!(py_str = PyObject_GetAttrString(py_obj, attr))) {
- /* TODO: report exception message/traceback to err/dbg */
- PyErr_Clear();
+ catch_exception("");
return SRD_ERR_PYTHON;
}
if (!PyUnicode_Check(py_str)) {
- srd_dbg("srd: %s attribute should be a string, but is a %s.",
- attr, Py_TYPE(py_str)->tp_name);
+ srd_dbg("%s attribute should be a string, but is a %s.",
+ attr, Py_TYPE(py_str)->tp_name);
Py_DecRef(py_str);
return SRD_ERR_PYTHON;
}
int ret;
if (!PyDict_Check(py_obj)) {
- srd_dbg("srd: Object is a %s, not a dictionary.", Py_TYPE(py_obj)->tp_name);
+ srd_dbg("Object is a %s, not a dictionary.", Py_TYPE(py_obj)->tp_name);
return SRD_ERR_PYTHON;
}
if (!(py_value = PyDict_GetItemString(py_obj, key))) {
- srd_dbg("srd: Dictionary has no attribute '%s'.", key);
+ srd_dbg("Dictionary has no attribute '%s'.", key);
return SRD_ERR_PYTHON;
}
if (!PyUnicode_Check(py_value)) {
- srd_dbg("srd: Dictionary value for %s should be a string, but is a %s.",
- key, Py_TYPE(py_value)->tp_name);
+ srd_dbg("Dictionary value for %s should be a string, but is a %s.",
+ key, Py_TYPE(py_value)->tp_name);
return SRD_ERR_PYTHON;
}
ret = SRD_OK;
if (!PyUnicode_Check(py_str)) {
- srd_dbg("srd: object is a %s, not a string object", Py_TYPE(py_str)->tp_name);
+ srd_dbg("Object is a %s, not a string object.", Py_TYPE(py_str)->tp_name);
ret = SRD_ERR_PYTHON;
goto err_out;
}
}
if (!(*outstr = g_strdup(str))) {
- srd_dbg("srd: malloc failed");
+ srd_dbg("outstr malloc failed");
ret = SRD_ERR_MALLOC;
goto err_out;
}
Py_XDECREF(py_encstr);
if (PyErr_Occurred()) {
- srd_dbg("srd: string conversion failed");
- /* TODO: dump exception to srd_dbg */
- PyErr_Clear();
+ catch_exception("string conversion failed");
}
return ret;