summaryrefslogtreecommitdiff
path: root/py/python/Ice.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-04-30 11:57:21 +0200
committerBenoit Foucher <benoit@zeroc.com>2012-04-30 11:57:21 +0200
commit06024a6fc1ceb70d70e41f93ba0016edefe36289 (patch)
tree40f4bdf32862e466d059bbf0dd1a7293aa522604 /py/python/Ice.py
parentWin32 fixes, C# port (diff)
downloadice-06024a6fc1ceb70d70e41f93ba0016edefe36289.tar.bz2
ice-06024a6fc1ceb70d70e41f93ba0016edefe36289.tar.xz
ice-06024a6fc1ceb70d70e41f93ba0016edefe36289.zip
Python port, added tests to Ice/info
Diffstat (limited to 'py/python/Ice.py')
-rw-r--r--py/python/Ice.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/py/python/Ice.py b/py/python/Ice.py
index be703c05255..38554d15fae 100644
--- a/py/python/Ice.py
+++ b/py/python/Ice.py
@@ -58,6 +58,13 @@ if _dlopenflags >= 0:
ObjectPrx = IcePy.ObjectPrx
stringVersion = IcePy.stringVersion
intVersion = IcePy.intVersion
+currentProtocol = IcePy.currentProtocol
+currentProtocolEncoding = IcePy.currentProtocolEncoding
+currentEncoding = IcePy.currentEncoding
+stringToProtocolVersion = IcePy.stringToProtocolVersion
+protocolVersionToString = IcePy.protocolVersionToString
+stringToEncodingVersion = IcePy.stringToEncodingVersion
+encodingVersionToString = IcePy.encodingVersionToString
generateUUID = IcePy.generateUUID
loadSlice = IcePy.loadSlice
AsyncResult = IcePy.AsyncResult
@@ -310,6 +317,7 @@ import Ice_Properties_ice
import Ice_Router_ice
import Ice_ServantLocator_ice
import Ice_Connection_ice
+import Ice_Version_ice
#
# Replace EndpointInfo with our implementation.
@@ -1381,3 +1389,8 @@ def getType(o):
#
def getHash(o):
return hash(o)
+
+Protocol_1_0 = ProtocolVersion(1, 0)
+Encoding_1_0 = EncodingVersion(1, 0)
+Encoding_1_1 = EncodingVersion(1, 1)
+