diff options
| author | Jose <jose@zeroc.com> | 2016-03-01 15:12:26 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-03-01 15:12:26 +0100 |
| commit | 1419f188bf7d06ba0131cfd94a82f5d43ec0c7dd (patch) | |
| tree | 38929143a6575d23e4438e590a20f525a829e194 /python/modules/IcePy/Init.cpp | |
| parent | Fix LMDB nuget package version (diff) | |
| parent | Ice::identityToString/Ice::stringToIdentity php/ruby/python implementations (diff) | |
| download | ice-1419f188bf7d06ba0131cfd94a82f5d43ec0c7dd.tar.bz2 ice-1419f188bf7d06ba0131cfd94a82f5d43ec0c7dd.tar.xz ice-1419f188bf7d06ba0131cfd94a82f5d43ec0c7dd.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'python/modules/IcePy/Init.cpp')
| -rw-r--r-- | python/modules/IcePy/Init.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/python/modules/IcePy/Init.cpp b/python/modules/IcePy/Init.cpp index 337298eed97..ea98eed6b89 100644 --- a/python/modules/IcePy/Init.cpp +++ b/python/modules/IcePy/Init.cpp @@ -58,6 +58,10 @@ static PyMethodDef methods[] = PyDoc_STR(STRCAST("generateUUID() -> string")) }, { STRCAST("createProperties"), reinterpret_cast<PyCFunction>(IcePy_createProperties), METH_VARARGS, PyDoc_STR(STRCAST("createProperties([args]) -> Ice.Properties")) }, + { STRCAST("stringToIdentity"), reinterpret_cast<PyCFunction>(IcePy_stringToIdentity), METH_O, + PyDoc_STR(STRCAST("stringToIdentity(string) -> Ice.Identity")) }, + { STRCAST("identityToString"), reinterpret_cast<PyCFunction>(IcePy_identityToString), METH_O, + PyDoc_STR(STRCAST("identityToString(Ice.Identity) -> string")) }, { STRCAST("getProcessLogger"), reinterpret_cast<PyCFunction>(IcePy_getProcessLogger), METH_NOARGS, PyDoc_STR(STRCAST("getProcessLogger() -> Ice.Logger")) }, { STRCAST("setProcessLogger"), reinterpret_cast<PyCFunction>(IcePy_setProcessLogger), METH_VARARGS, |