Merge remote-tracking branch 'origin/3.6'

1 files changed, 49 insertions, 0 deletions

diff --git a/python/modules/IcePy/Communicator.cpp b/python/modules/IcePy/Communicator.cpp
index 3f2d56e4c32..c98f1f1c8f0 100644
--- a/python/modules/IcePy/Communicator.cpp
+++ b/python/modules/IcePy/Communicator.cpp
@@ -1737,3 +1737,52 @@ IcePy::getCommunicatorWrapper(const Ice::CommunicatorPtr& communicator)
     Py_INCREF(obj->wrapper);
     return obj->wrapper;
 }
+
+extern "C"
+PyObject*
+IcePy_identityToString(PyObject* /*self*/, PyObject* obj)
+{
+    Ice::Identity id;
+    if(!getIdentity(obj, id))
+    {
+        return 0;
+    }
+    
+    string str;
+
+    try
+    {
+        str = Ice::identityToString(id);
+    }
+    catch(const Ice::Exception& ex)
+    {
+        setPythonException(ex);
+        return 0;
+    }
+
+    return createString(str);
+}
+
+extern "C"
+PyObject*
+IcePy_stringToIdentity(PyObject* /*self*/, PyObject* obj)
+{
+    string str;
+    if(!getStringArg(obj, "str", str))
+    {
+        return 0;
+    }
+
+    Ice::Identity id;
+    try
+    {
+        id = Ice::stringToIdentity(str);
+    }
+    catch(const Ice::Exception& ex)
+    {
+        setPythonException(ex);
+        return 0;
+    }
+
+    return createIdentity(id);
+}