summaryrefslogtreecommitdiff
path: root/python/modules/IcePy/ObjectAdapter.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2017-03-08 15:47:34 -0800
committerMark Spruiell <mes@zeroc.com>2017-03-08 15:47:34 -0800
commitfc32c2a7805365e7f40ab8a664f94efae35137da (patch)
tree9004df864027bfef52218772e88357e01d9bdf0c /python/modules/IcePy/ObjectAdapter.cpp
parentRefreshed Ice::optional (diff)
downloadice-fc32c2a7805365e7f40ab8a664f94efae35137da.tar.bz2
ice-fc32c2a7805365e7f40ab8a664f94efae35137da.tar.xz
ice-fc32c2a7805365e7f40ab8a664f94efae35137da.zip
- ICE-6845 - More dispatcher fixes for Python
- Deprecated the InitializationData.threadHook member - Added threadStart and threadStop members to InitializationData - InitializationData.batchRequestInterceptor can now be a callable
Diffstat (limited to 'python/modules/IcePy/ObjectAdapter.cpp')
-rw-r--r--python/modules/IcePy/ObjectAdapter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/modules/IcePy/ObjectAdapter.cpp b/python/modules/IcePy/ObjectAdapter.cpp
index 07877369274..9beb09d1f52 100644
--- a/python/modules/IcePy/ObjectAdapter.cpp
+++ b/python/modules/IcePy/ObjectAdapter.cpp
@@ -1878,7 +1878,7 @@ IcePy::unwrapObjectAdapter(PyObject* obj)
#endif
assert(wrapperType);
assert(PyObject_IsInstance(obj, wrapperType));
- PyObjectHandle impl = PyObject_GetAttrString(obj, STRCAST("_impl"));
+ PyObjectHandle impl = getAttr(obj, "_impl", false);
assert(impl.get());
return getObjectAdapter(impl.get());
}