summaryrefslogtreecommitdiff
path: root/py/python/Ice.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2010-01-06 12:43:48 +0100
committerBenoit Foucher <benoit@zeroc.com>2010-01-06 12:43:48 +0100
commitbc2e4034079842cde62b6b44c4bdcd6a954f4f46 (patch)
tree0afd6dbfade2a57978227193d5dccdc267e89d7b /py/python/Ice.py
parentbug 4495 - clean up book demos (diff)
downloadice-bc2e4034079842cde62b6b44c4bdcd6a954f4f46.tar.bz2
ice-bc2e4034079842cde62b6b44c4bdcd6a954f4f46.tar.xz
ice-bc2e4034079842cde62b6b44c4bdcd6a954f4f46.zip
Merged Mark's pythonami branch
Diffstat (limited to 'py/python/Ice.py')
-rw-r--r--py/python/Ice.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/py/python/Ice.py b/py/python/Ice.py
index e1d2d8ff442..23c4728afd0 100644
--- a/py/python/Ice.py
+++ b/py/python/Ice.py
@@ -60,6 +60,7 @@ stringVersion = IcePy.stringVersion
intVersion = IcePy.intVersion
generateUUID = IcePy.generateUUID
loadSlice = IcePy.loadSlice
+AsyncResult = IcePy.AsyncResult
#
# This value is used as the default value for struct types in the constructors
@@ -449,6 +450,12 @@ class CommunicatorI(Communicator):
def flushBatchRequests(self):
self._impl.flushBatchRequests()
+ def begin_flushBatchRequests(self, _ex=None, _sent=None):
+ return self._impl.begin_flushBatchRequests(_ex, _sent)
+
+ def end_flushBatchRequests(self, r):
+ return self._impl.end_flushBatchRequests(r)
+
def getAdmin(self):
return self._impl.getAdmin()