summaryrefslogtreecommitdiff
path: root/python/modules/IcePy/Proxy.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2017-05-04 10:27:10 -0700
committerMark Spruiell <mes@zeroc.com>2017-05-04 10:27:10 -0700
commita03ae69b8b4c5ee3d26fa3d3bf64267a920d17a9 (patch)
treec865a871c5b36152708994068c7ce09c82abc1eb /python/modules/IcePy/Proxy.cpp
parentFixes ice_scheduler/ice_executor: (diff)
downloadice-a03ae69b8b4c5ee3d26fa3d3bf64267a920d17a9.tar.bz2
ice-a03ae69b8b4c5ee3d26fa3d3bf64267a920d17a9.tar.xz
ice-a03ae69b8b4c5ee3d26fa3d3bf64267a920d17a9.zip
ICE-7275 - Raise NotImplementedError in generated Python skeletons
ICE-7763 - Add support for marshaled-result in Python
Diffstat (limited to 'python/modules/IcePy/Proxy.cpp')
-rw-r--r--python/modules/IcePy/Proxy.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/python/modules/IcePy/Proxy.cpp b/python/modules/IcePy/Proxy.cpp
index e2121d5e252..fd44da8defc 100644
--- a/python/modules/IcePy/Proxy.cpp
+++ b/python/modules/IcePy/Proxy.cpp
@@ -1172,8 +1172,15 @@ extern "C"
static PyObject*
proxyIceEncodingVersion(ProxyObject* self, PyObject* args)
{
+ PyObject* versionType = IcePy::lookupType("Ice.EncodingVersion");
+ PyObject* p;
+ if(!PyArg_ParseTuple(args, STRCAST("O!"), versionType, &p))
+ {
+ return 0;
+ }
+
Ice::EncodingVersion val;
- if(!getEncodingVersion(args, val))
+ if(!getEncodingVersion(p, val))
{
PyErr_Format(PyExc_ValueError, STRCAST("ice_encodingVersion requires an encoding version"));
return 0;