Additional fixes & simplifications

zeroc-ice · Oct 17, 2024 · c92eb05 · c92eb05
1 parent e54e899
commit c92eb05
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 21 deletions.
diff --git a/python/modules/IcePy/Types.cpp b/python/modules/IcePy/Types.cpp
@@ -296,14 +296,7 @@ IcePy::StreamUtil::setSlicedDataMember(PyObject* obj, const Ice::SlicedDataPtr&
         assert(_sliceInfoType);
     }
 
-    IcePy::PyObjectHandle args{PyTuple_New(0)};
-    if (!args.get())
-    {
-        assert(PyErr_Occurred());
-        throw AbortMarshaling();
-    }
-
-    PyObjectHandle sd{PyObject_CallObject(_slicedDataType, args.get())};
+    PyObjectHandle sd{PyObject_CallObject(_slicedDataType, nullptr)};
     if (!sd.get())
     {
         assert(PyErr_Occurred());
@@ -329,7 +322,7 @@ IcePy::StreamUtil::setSlicedDataMember(PyObject* obj, const Ice::SlicedDataPtr&
     int i = 0;
     for (vector<Ice::SliceInfoPtr>::const_iterator p = slicedData->slices.begin(); p != slicedData->slices.end(); ++p)
     {
-        PyObjectHandle slice{PyObject_CallObject(_sliceInfoType, args.get())};
+        PyObjectHandle slice{PyObject_CallObject(_sliceInfoType, nullptr)};
         if (!slice.get())
         {
             assert(PyErr_Occurred());
@@ -1477,14 +1470,12 @@ IcePy::SequenceInfo::marshal(
             if (p != Py_None)
             {
                 Py_buffer pybuf;
-                if (PyObject_GetBuffer(p, &pybuf, PyBUF_SIMPLE | PyBUF_FORMAT) == 0)
+                if (pi && PyObject_GetBuffer(p, &pybuf, PyBUF_SIMPLE | PyBUF_FORMAT) == 0)
                 {
-                    if (pi->kind == PrimitiveInfo::KindString)
-                    {
-                        PyErr_Format(PyExc_ValueError, "expected sequence value");
-                        throw AbortMarshaling();
-                    }
+                    // Strings are handled as variable length types above.
+                    assert(pi->kind != PrimitiveInfo::KindString);
                     sz = pybuf.len;
+                    PyBuffer_Release(&pybuf);
                 }
                 else
                 {

diff --git a/python/modules/IcePy/Util.cpp b/python/modules/IcePy/Util.cpp
@@ -611,12 +611,7 @@ PyObject*
 IcePy::createExceptionInstance(PyObject* type)
 {
     assert(PyExceptionClass_Check(type));
-    IcePy::PyObjectHandle args{PyTuple_New(0)};
-    if (!args.get())
-    {
-        return nullptr;
-    }
-    return PyObject_CallObject(type, args.get());
+    return PyObject_CallObject(type, nullptr);
 }
 
 namespace