From e2b58bf3d52e4f9b5eea8885d95e4a255d072ea2 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 18 Nov 2020 18:21:15 +0100 Subject: [PATCH] App: simplify the logic in PropertyLinkList::getPyValue --- src/App/PropertyLinks.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp index de95973edc..dc215c6608 100644 --- a/src/App/PropertyLinks.cpp +++ b/src/App/PropertyLinks.cpp @@ -715,15 +715,18 @@ PyObject *PropertyLinkList::getPyObject(void) return Py::new_reference_to(sequence); } -DocumentObject *PropertyLinkList::getPyValue(PyObject *item) const { +DocumentObject *PropertyLinkList::getPyValue(PyObject *item) const +{ if (item == Py_None) { return nullptr; - } else if (!PyObject_TypeCheck(item, &(DocumentObjectPy::Type))) { - std::string error = std::string("type must be 'DocumentObject', list of 'DocumentObject', or NoneType, not "); - error += item->ob_type->tp_name; - throw Base::TypeError(error); } - return static_cast(item)->getDocumentObjectPtr(); + else if (PyObject_TypeCheck(item, &(DocumentObjectPy::Type))) { + return static_cast(item)->getDocumentObjectPtr(); + } + + std::string error = std::string("type must be 'DocumentObject', list of 'DocumentObject', or NoneType, not "); + error += item->ob_type->tp_name; + throw Base::TypeError(error); } void PropertyLinkList::Save(Base::Writer &writer) const