kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Spreadsheet: Check Python types using Base::PyTypeCheck

Browse Source
This commit is contained in:
marioalexis
2022-07-20 01:19:29 -03:00
committed by Uwe
parent fa6cf56020
commit 14db1b7c98
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Mod/Spreadsheet/App/SheetPyImp.cpp
View File

@@ -494,13 +494,8 @@ PyObject* SheetPy::setAlias(PyObject *args)
try {
address = stringToAddress(strAddress);
if (PyUnicode_Check(value))
getSheetPtr()->setAlias(address, PyUnicode_AsUTF8(value));
else if (value == Py_None)
getSheetPtr()->setAlias(address, "");
else
throw Base::TypeError("String or None expected");
Base::PyTypeCheck(&value, &PyUnicode_Type, "String or None expected");
getSheetPtr()->setAlias(address, value ? PyUnicode_AsUTF8(value) : "");
Py_Return;
}
catch (const Base::Exception & e) {
@@ -523,10 +518,8 @@ PyObject* SheetPy::getAlias(PyObject *args)
if (cell && cell->getAlias(alias))
return Py::new_reference_to( Py::String( alias ) );
else {
Py_INCREF(Py_None);
return Py_None;
}
else
Py_Return;
}
catch (const Base::Exception & e) {
PyErr_SetString(PyExc_ValueError, e.what());
@@ -546,10 +539,8 @@ PyObject* SheetPy::getCellFromAlias(PyObject *args)
if (!address.empty())
return Py::new_reference_to( Py::String( address ) );
else {
Py_INCREF(Py_None);
return Py_None;
}
else
Py_Return;
}
catch (const Base::Exception & e) {
PyErr_SetString(PyExc_ValueError, e.what());