Fixed ICE-7493 - Support for java try-with and Python with statements for the Ice.Communicator

4 files changed, 8 insertions, 20 deletions

diff --git a/python/test/Ice/exceptions/Client.py b/python/test/Ice/exceptions/Client.py
index a721c09b5e5..2a2a9ddbcb4 100755
--- a/python/test/Ice/exceptions/Client.py
+++ b/python/test/Ice/exceptions/Client.py
@@ -29,13 +29,10 @@ try:
     initData.properties = Ice.createProperties(sys.argv)
     initData.properties.setProperty("Ice.MessageSizeMax", "10")
     initData.properties.setProperty("Ice.Warn.Connections", "0");
-    communicator = Ice.initialize(sys.argv, initData)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv, initData) as communicator:
+        status = run(sys.argv, communicator)
 except:
     traceback.print_exc()
     status = False
 
-if communicator:
-    communicator.destroy()
-
 sys.exit(not status)
diff --git a/python/test/Ice/exceptions/Collocated.py b/python/test/Ice/exceptions/Collocated.py
index 555805a08db..b0345cbc7d7 100755
--- a/python/test/Ice/exceptions/Collocated.py
+++ b/python/test/Ice/exceptions/Collocated.py
@@ -36,13 +36,10 @@ try:
     initData = Ice.InitializationData()
     initData.properties = Ice.createProperties(sys.argv)
     initData.properties.setProperty("Ice.MessageSizeMax", "10")
-    communicator = Ice.initialize(sys.argv, initData)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv, initData) as communicator:
+        status = run(sys.argv, communicator)
 except:
     traceback.print_exc()
     status = False
 
-if communicator:
-    communicator.destroy()
-
 sys.exit(not status)
diff --git a/python/test/Ice/exceptions/Server.py b/python/test/Ice/exceptions/Server.py
index 3cb70a97161..018adf04c93 100755
--- a/python/test/Ice/exceptions/Server.py
+++ b/python/test/Ice/exceptions/Server.py
@@ -44,13 +44,10 @@ try:
     initData.properties.setProperty("TestAdapter2.MessageSizeMax", "0")
     initData.properties.setProperty("TestAdapter3.Endpoints", "default -p 12012")
     initData.properties.setProperty("TestAdapter3.MessageSizeMax", "1")
-    communicator = Ice.initialize(sys.argv, initData)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv, initData) as communicator:
+        status = run(sys.argv, communicator)
 except:
     traceback.print_exc()
     status = False
 
-if communicator:
-    communicator.destroy()
-
 sys.exit(not status)
diff --git a/python/test/Ice/exceptions/ServerAMD.py b/python/test/Ice/exceptions/ServerAMD.py
index 999a41115c8..04e28fdf8d0 100755
--- a/python/test/Ice/exceptions/ServerAMD.py
+++ b/python/test/Ice/exceptions/ServerAMD.py
@@ -175,13 +175,10 @@ try:
     initData.properties.setProperty("TestAdapter2.MessageSizeMax", "0")
     initData.properties.setProperty("TestAdapter3.Endpoints", "default -p 12012")
     initData.properties.setProperty("TestAdapter3.MessageSizeMax", "1")
-    communicator = Ice.initialize(sys.argv, initData)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv, initData) as communicator:
+        status = run(sys.argv, communicator)
 except:
     traceback.print_exc()
     status = False
 
-if communicator:
-    communicator.destroy()
-
 sys.exit(not status)