Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix raising of RequestFailedException in Python #2589

Merged
merged 3 commits into from
Jul 31, 2024
Merged

Fix raising of RequestFailedException in Python #2589

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c604483
Fix raising of RequestFailedException in Python
pepone Jul 31, 2024
0f6a8e2
clang-format fixes
pepone Jul 31, 2024
1f47b08
Add test for throwing RequestFailedException from Python
pepone Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 42 additions & 25 deletions python/modules/IcePy/Util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,7 @@ IcePy::getAttr(PyObject* obj, const string& attrib, bool allowNone)
{
if (!allowNone)
{
Py_DECREF(v);
v = 0;
v = nullptr;
}
}
else if (!v)
Expand Down Expand Up @@ -272,22 +271,24 @@ IcePy::PyObjectHandle::release()

IcePy::PyException::PyException()
{
PyObject* type;
PyObject* e;
PyObject* tb;

PyErr_Fetch(&type, &e, &tb); // PyErr_Fetch clears the exception.
PyErr_NormalizeException(&type, &e, &tb);
Comment on lines -279 to -280
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These methods are deprecated in Python 3.12


_type = type;
ex = e;
_tb = tb;
ex = PyErr_GetRaisedException();
if (ex)
{
PyObject* type = reinterpret_cast<PyObject*>(Py_TYPE(ex.get()));
Py_INCREF(type);
_type = type;
_tb = PyException_GetTraceback(ex.get());
}
}

IcePy::PyException::PyException(PyObject* p)
IcePy::PyException::PyException(PyObject* raisedException)
{
ex = p;
Py_XINCREF(p);
Py_XINCREF(raisedException);
ex = raisedException;
PyObject* type = reinterpret_cast<PyObject*>(Py_TYPE(raisedException));
Py_INCREF(type);
_type = type;
_tb = PyException_GetTraceback(raisedException);
}

void
Expand Down Expand Up @@ -367,17 +368,33 @@ IcePy::PyException::raiseLocalException()
{
string typeName = getTypeName();

if (typeName == "Ice.ObjectNotExistException")
{
throw Ice::ObjectNotExistException(__FILE__, __LINE__);
}
else if (typeName == "Ice.OperationNotExistException")
{
throw Ice::OperationNotExistException(__FILE__, __LINE__);
}
else if (typeName == "Ice.FacetNotExistException")
PyObject* requestFailedExceptionType = lookupType("Ice.RequestFailedException");

if (PyObject_IsInstance(ex.get(), requestFailedExceptionType))
{
throw Ice::FacetNotExistException(__FILE__, __LINE__);
PyObjectHandle idAttr = getAttr(ex.get(), "id", false);
Ice::Identity id;
if (idAttr.get())
{
IcePy::getIdentity(idAttr.get(), id);
}
PyObjectHandle facetAttr = getAttr(ex.get(), "facet", false);
string facet = getString(facetAttr.get());
PyObjectHandle operationAttr = getAttr(ex.get(), "operation", false);
string operation = getString(operationAttr.get());

if (typeName == "Ice.ObjectNotExistException")
{
throw Ice::ObjectNotExistException(__FILE__, __LINE__, std::move(id), std::move(facet), std::move(operation));
}
else if (typeName == "Ice.OperationNotExistException")
{
throw Ice::OperationNotExistException(__FILE__, __LINE__, std::move(id), std::move(facet), std::move(operation));
}
else if (typeName == "Ice.FacetNotExistException")
{
throw Ice::FacetNotExistException(__FILE__, __LINE__, std::move(id), std::move(facet), std::move(operation));
}
}

IcePy::PyObjectHandle exStr = PyObject_Str(ex.get());
Expand Down
Loading