diff options
| author | Mark Spruiell <mes@zeroc.com> | 2017-01-31 10:56:12 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2017-01-31 10:56:12 -0800 |
| commit | 9a30869c4453e0aea52ab46aff2199216b50e1b5 (patch) | |
| tree | 164232a58ca6540d1890fadc750e561e57237674 /python/modules/IcePy/Operation.cpp | |
| parent | adding IceBridge man page (diff) | |
| parent | ICE-7359 - Fix usage of PyTuple_SET_ITEM (diff) | |
| download | ice-9a30869c4453e0aea52ab46aff2199216b50e1b5.tar.bz2 ice-9a30869c4453e0aea52ab46aff2199216b50e1b5.tar.xz ice-9a30869c4453e0aea52ab46aff2199216b50e1b5.zip | |
Merging 3.6 for ICE-7539
Diffstat (limited to 'python/modules/IcePy/Operation.cpp')
| -rw-r--r-- | python/modules/IcePy/Operation.cpp | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/python/modules/IcePy/Operation.cpp b/python/modules/IcePy/Operation.cpp index d4e7d9993c2..f97d6a6d3bb 100644 --- a/python/modules/IcePy/Operation.cpp +++ b/python/modules/IcePy/Operation.cpp @@ -2923,10 +2923,7 @@ IcePy::SyncBlobjectInvocation::invoke(PyObject* args, PyObject* /* kwds */) throwPythonException(); } - if(PyTuple_SET_ITEM(result.get(), 0, ok ? incTrue() : incFalse()) < 0) - { - throwPythonException(); - } + PyTuple_SET_ITEM(result.get(), 0, ok ? incTrue() : incFalse()); #if PY_VERSION_HEX >= 0x03000000 PyObjectHandle op; @@ -3196,10 +3193,7 @@ IcePy::AsyncBlobjectInvocation::end(const Ice::ObjectPrx& proxy, const Ice::Asyn return 0; } - if(PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse()) < 0) - { - return 0; - } + PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse()); #if PY_VERSION_HEX >= 0x03000000 Py_ssize_t sz = results.second - results.first; @@ -3275,12 +3269,7 @@ IcePy::AsyncBlobjectInvocation::response(bool ok, const pair<const Ice::Byte*, c return; } - if(PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse()) < 0) - { - assert(PyErr_Occurred()); - PyErr_Print(); - return; - } + PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse()); #if PY_VERSION_HEX >= 0x03000000 Py_ssize_t sz = results.second - results.first; @@ -3458,12 +3447,7 @@ IcePy::NewAsyncBlobjectInvocation::handleResponse(PyObject* future, bool ok, return; } - if(PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse()) < 0) - { - assert(PyErr_Occurred()); - PyErr_Print(); - return; - } + PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse()); #if PY_VERSION_HEX >= 0x03000000 Py_ssize_t sz = results.second - results.first; |