diff options
| author | Mark Spruiell <mes@zeroc.com> | 2008-03-06 19:18:15 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2008-03-06 19:18:15 -0800 |
| commit | a1ba594bc48bfd670f8143473361d07090aab8f0 (patch) | |
| tree | 56fb51c131ad314e1f698616edac27807bf69f9e /py/modules/IcePy/Communicator.cpp | |
| parent | Merge branch 'master' of ssh://git/home/git/ice (diff) | |
| download | ice-a1ba594bc48bfd670f8143473361d07090aab8f0.tar.bz2 ice-a1ba594bc48bfd670f8143473361d07090aab8f0.tar.xz ice-a1ba594bc48bfd670f8143473361d07090aab8f0.zip | |
Python changes:
- Adding ice_flushBatchRequests, ice_flushBatchRequests_async
- Adding support for ice_sent callback
Diffstat (limited to 'py/modules/IcePy/Communicator.cpp')
| -rw-r--r-- | py/modules/IcePy/Communicator.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/py/modules/IcePy/Communicator.cpp b/py/modules/IcePy/Communicator.cpp index 23231208a50..6dea0305af6 100644 --- a/py/modules/IcePy/Communicator.cpp +++ b/py/modules/IcePy/Communicator.cpp @@ -141,6 +141,7 @@ communicatorInit(CommunicatorObject* self, PyObject* args, PyObject* /*kwds*/) PyObjectHandle properties = PyObject_GetAttrString(initData, STRCAST("properties")); PyObjectHandle logger = PyObject_GetAttrString(initData, STRCAST("logger")); PyObjectHandle threadHook = PyObject_GetAttrString(initData, STRCAST("threadHook")); + PyErr_Clear(); // PyObject_GetAttrString sets an error on failure. if(properties.get() && properties.get() != Py_None) { @@ -426,14 +427,7 @@ communicatorIsShutdown(CommunicatorObject* self) return 0; } - if(isShutdown) - { - PyRETURN_TRUE; - } - else - { - PyRETURN_FALSE; - } + PyRETURN_BOOL(isShutdown); } #ifdef WIN32 |