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

59 files changed, 136 insertions, 311 deletions

diff --git a/python/python/Ice.py b/python/python/Ice.py
index 4c7e80227cf..80b48c639fc 100644
--- a/python/python/Ice.py
+++ b/python/python/Ice.py
@@ -318,10 +318,10 @@ Returns:
     #    pass
 
 class InterfaceByValue(Value):
-    
+
     def __init__(self, id):
         self.id = id
-    
+
     def ice_id(self):
         return self.id
 
@@ -838,6 +838,12 @@ class CommunicatorI(Communicator):
         self._impl = impl
         impl._setWrapper(self)
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        self._impl.destroy()
+
     def destroy(self):
         self._impl.destroy()
 
diff --git a/python/test/Ice/acm/Client.py b/python/test/Ice/acm/Client.py
index 8e9586ab9f7..7a2023a4374 100755
--- a/python/test/Ice/acm/Client.py
+++ b/python/test/Ice/acm/Client.py
@@ -32,13 +32,10 @@ try:
     initData = Ice.InitializationData()
     initData.properties = Ice.createProperties(sys.argv)
     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/acm/Server.py b/python/test/Ice/acm/Server.py
index 2db5b7dece5..3631b716932 100755
--- a/python/test/Ice/acm/Server.py
+++ b/python/test/Ice/acm/Server.py
@@ -37,13 +37,10 @@ try:
     initData.properties = Ice.createProperties(sys.argv)
     initData.properties.setProperty("Ice.Warn.Connections", "0");
     initData.properties.setProperty("Ice.ACM.Timeout", "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/admin/Client.py b/python/test/Ice/admin/Client.py
index 8ad8e0d5fe3..0d4f59af69d 100644
--- a/python/test/Ice/admin/Client.py
+++ b/python/test/Ice/admin/Client.py
@@ -28,13 +28,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/admin/Server.py b/python/test/Ice/admin/Server.py
index 50b762fc9ec..90acf7530a3 100644
--- a/python/test/Ice/admin/Server.py
+++ b/python/test/Ice/admin/Server.py
@@ -30,13 +30,10 @@ def run(args, communicator):
     return True;
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/ami/Client.py b/python/test/Ice/ami/Client.py
index d3a0275ffe2..1966ff4bd6d 100755
--- a/python/test/Ice/ami/Client.py
+++ b/python/test/Ice/ami/Client.py
@@ -40,13 +40,10 @@ try:
     #
     initData.properties.setProperty("Ice.TCP.SndSize", "50000");
 
-    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/ami/Collocated.py b/python/test/Ice/ami/Collocated.py
index 8336b26a3d9..060bf5b4c52 100755
--- a/python/test/Ice/ami/Collocated.py
+++ b/python/test/Ice/ami/Collocated.py
@@ -50,13 +50,10 @@ try:
     #
     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/ami/Server.py b/python/test/Ice/ami/Server.py
index c98543c93b2..1872276ecb0 100755
--- a/python/test/Ice/ami/Server.py
+++ b/python/test/Ice/ami/Server.py
@@ -52,13 +52,10 @@ try:
     #
     initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
 
-    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/binding/Client.py b/python/test/Ice/binding/Client.py
index c702a3752da..7aff07d049c 100755
--- a/python/test/Ice/binding/Client.py
+++ b/python/test/Ice/binding/Client.py
@@ -20,13 +20,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/binding/Server.py b/python/test/Ice/binding/Server.py
index 5cfa8e9a7df..623afa99954 100755
--- a/python/test/Ice/binding/Server.py
+++ b/python/test/Ice/binding/Server.py
@@ -25,13 +25,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/blobject/Client.py b/python/test/Ice/blobject/Client.py
index ce25b994c8c..43d6be41f50 100755
--- a/python/test/Ice/blobject/Client.py
+++ b/python/test/Ice/blobject/Client.py
@@ -52,41 +52,31 @@ try:
     initData = Ice.InitializationData()
     initData.properties = Ice.createProperties(argv)
     initData.properties.setProperty('Ice.Warn.Dispatch', '0')
-    communicator = Ice.initialize(argv, initData)
-    router = RouterI.RouterI(communicator, False)
-    sys.stdout.write("testing async blobject... ")
-    sys.stdout.flush()
-    status = run(sys.argv, communicator, False)
-    print("ok")
-    router.destroy()
+    with Ice.initialize(argv, initData) as communicator:
+        router = RouterI.RouterI(communicator, False)
+        sys.stdout.write("testing async blobject... ")
+        sys.stdout.flush()
+        status = run(sys.argv, communicator, False)
+        print("ok")
+        router.destroy()
 except:
     traceback.print_exc()
     status = False
 
-if communicator:
-    communicator.destroy()
-
 if status:
     try:
         initData = Ice.InitializationData()
         initData.properties = Ice.createProperties(sys.argv)
         initData.properties.setProperty('Ice.Warn.Dispatch', '0')
-        communicator = Ice.initialize(sys.argv, initData)
-        router = RouterI.RouterI(communicator, True)
-        sys.stdout.write("testing sync blobject... ")
-        sys.stdout.flush()
-        status = run(sys.argv, communicator, True)
-        print("ok")
-        router.destroy()
+        with Ice.initialize(sys.argv, initData) as communicator:
+            router = RouterI.RouterI(communicator, True)
+            sys.stdout.write("testing sync blobject... ")
+            sys.stdout.flush()
+            status = run(sys.argv, communicator, True)
+            print("ok")
+            router.destroy()
     except:
         traceback.print_exc()
         status = False
 
-    if communicator:
-        try:
-            communicator.destroy()
-        except:
-            traceback.print_exc()
-            status = False
-
 sys.exit(not status)
diff --git a/python/test/Ice/blobject/Server.py b/python/test/Ice/blobject/Server.py
index cd02c163c36..ad6d43b5b9f 100755
--- a/python/test/Ice/blobject/Server.py
+++ b/python/test/Ice/blobject/Server.py
@@ -47,13 +47,10 @@ try:
     # this warning.
     #
     initData.properties.setProperty("Ice.Warn.Dispatch", "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/checksum/Client.py b/python/test/Ice/checksum/Client.py
index ac14ef4820a..fc8e6a1de9c 100755
--- a/python/test/Ice/checksum/Client.py
+++ b/python/test/Ice/checksum/Client.py
@@ -25,13 +25,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/checksum/Server.py b/python/test/Ice/checksum/Server.py
index 990de16608e..6b1ae945fad 100755
--- a/python/test/Ice/checksum/Server.py
+++ b/python/test/Ice/checksum/Server.py
@@ -36,13 +36,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/custom/Client.py b/python/test/Ice/custom/Client.py
index 31d6c9f0d7c..377c310b823 100755
--- a/python/test/Ice/custom/Client.py
+++ b/python/test/Ice/custom/Client.py
@@ -20,13 +20,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/custom/Server.py b/python/test/Ice/custom/Server.py
index 0c118c80344..49c830c1ace 100755
--- a/python/test/Ice/custom/Server.py
+++ b/python/test/Ice/custom/Server.py
@@ -99,13 +99,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/defaultServant/Client.py b/python/test/Ice/defaultServant/Client.py
index c702a3752da..7aff07d049c 100755
--- a/python/test/Ice/defaultServant/Client.py
+++ b/python/test/Ice/defaultServant/Client.py
@@ -20,13 +20,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/enums/Client.py b/python/test/Ice/enums/Client.py
index cc50301dbf1..8033ba44588 100755
--- a/python/test/Ice/enums/Client.py
+++ b/python/test/Ice/enums/Client.py
@@ -20,13 +20,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/enums/Server.py b/python/test/Ice/enums/Server.py
index 299e1196301..bdb7a4357d3 100755
--- a/python/test/Ice/enums/Server.py
+++ b/python/test/Ice/enums/Server.py
@@ -56,13 +56,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/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)
diff --git a/python/test/Ice/facets/Client.py b/python/test/Ice/facets/Client.py
index 07b46c03e43..cf0d5394643 100755
--- a/python/test/Ice/facets/Client.py
+++ b/python/test/Ice/facets/Client.py
@@ -21,13 +21,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/facets/Collocated.py b/python/test/Ice/facets/Collocated.py
index 7b0734c6801..47844d24114 100755
--- a/python/test/Ice/facets/Collocated.py
+++ b/python/test/Ice/facets/Collocated.py
@@ -32,13 +32,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/facets/Server.py b/python/test/Ice/facets/Server.py
index 293b1a24bdc..89871e1feb5 100755
--- a/python/test/Ice/facets/Server.py
+++ b/python/test/Ice/facets/Server.py
@@ -31,13 +31,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/faultTolerance/Client.py b/python/test/Ice/faultTolerance/Client.py
index 2148c01553b..2284d80f979 100755
--- a/python/test/Ice/faultTolerance/Client.py
+++ b/python/test/Ice/faultTolerance/Client.py
@@ -51,13 +51,10 @@ try:
     #
     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/faultTolerance/Server.py b/python/test/Ice/faultTolerance/Server.py
index 6185f4e23ac..d5545bd1000 100755
--- a/python/test/Ice/faultTolerance/Server.py
+++ b/python/test/Ice/faultTolerance/Server.py
@@ -69,13 +69,10 @@ try:
     initData.properties = Ice.createProperties(sys.argv)
     initData.properties.setProperty("Ice.ServerIdleTime", "120") # Two minutes.
 
-    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/info/Client.py b/python/test/Ice/info/Client.py
index 8d395d34d36..cb2771d86ba 100755
--- a/python/test/Ice/info/Client.py
+++ b/python/test/Ice/info/Client.py
@@ -30,13 +30,10 @@ def run(args, communicator):
 try:
     initData = Ice.InitializationData()
     initData.properties = Ice.createProperties(sys.argv)
-    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/info/Server.py b/python/test/Ice/info/Server.py
index 63dfac1ebd0..3a5ade3c048 100755
--- a/python/test/Ice/info/Server.py
+++ b/python/test/Ice/info/Server.py
@@ -30,13 +30,10 @@ def run(args, communicator):
 try:
     initData = Ice.InitializationData()
     initData.properties = Ice.createProperties(sys.argv)
-    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/inheritance/Client.py b/python/test/Ice/inheritance/Client.py
index 5d978d0bb61..e095ce7f61c 100755
--- a/python/test/Ice/inheritance/Client.py
+++ b/python/test/Ice/inheritance/Client.py
@@ -20,13 +20,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/inheritance/Collocated.py b/python/test/Ice/inheritance/Collocated.py
index 5fd18d1b4c6..22552fc8565 100755
--- a/python/test/Ice/inheritance/Collocated.py
+++ b/python/test/Ice/inheritance/Collocated.py
@@ -26,13 +26,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/inheritance/Server.py b/python/test/Ice/inheritance/Server.py
index 027ff3b5e80..c00f6ec3813 100755
--- a/python/test/Ice/inheritance/Server.py
+++ b/python/test/Ice/inheritance/Server.py
@@ -24,13 +24,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/location/Client.py b/python/test/Ice/location/Client.py
index 71418f137a6..2dc7cf6597b 100755
--- a/python/test/Ice/location/Client.py
+++ b/python/test/Ice/location/Client.py
@@ -31,13 +31,10 @@ try:
     data = Ice.InitializationData()
     data.properties = Ice.createProperties(sys.argv)
     data.properties.setProperty("Ice.Default.Locator", "locator:default -p 12010")
-    communicator = Ice.initialize(sys.argv, data)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv, data) 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/location/Server.py b/python/test/Ice/location/Server.py
index 00e91ef3f47..124407f3588 100755
--- a/python/test/Ice/location/Server.py
+++ b/python/test/Ice/location/Server.py
@@ -183,13 +183,10 @@ def run(args, communicator, initData):
 try:
     initData = Ice.InitializationData()
     initData.properties = Ice.createProperties(sys.argv)
-    communicator = Ice.initialize(sys.argv, initData)
-    status = run(sys.argv, communicator, initData)
+    with Ice.initialize(sys.argv, initData) as communicator:
+        status = run(sys.argv, communicator, initData)
 except:
     traceback.print_exc()
     status = False
 
-if communicator:
-    communicator.destroy()
-
 sys.exit(not status)
diff --git a/python/test/Ice/objects/Client.py b/python/test/Ice/objects/Client.py
index 6cd16ce186d..00d366ff9e3 100755
--- a/python/test/Ice/objects/Client.py
+++ b/python/test/Ice/objects/Client.py
@@ -21,13 +21,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/objects/Collocated.py b/python/test/Ice/objects/Collocated.py
index ca2c54b22bc..8a9fd789eb8 100755
--- a/python/test/Ice/objects/Collocated.py
+++ b/python/test/Ice/objects/Collocated.py
@@ -32,13 +32,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/objects/Server.py b/python/test/Ice/objects/Server.py
index b986603ccdf..4810fefa5b9 100755
--- a/python/test/Ice/objects/Server.py
+++ b/python/test/Ice/objects/Server.py
@@ -40,13 +40,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/operations/Client.py b/python/test/Ice/operations/Client.py
index 2815874b243..6bcc4502d00 100755
--- a/python/test/Ice/operations/Client.py
+++ b/python/test/Ice/operations/Client.py
@@ -49,13 +49,10 @@ try:
     initData.properties.setProperty('Ice.ThreadPool.Client.SizeWarn', '0')
     initData.properties.setProperty("Ice.BatchAutoFlushSize", "100")
 
-    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/operations/Collocated.py b/python/test/Ice/operations/Collocated.py
index 02d35848c0c..a8240de89e8 100755
--- a/python/test/Ice/operations/Collocated.py
+++ b/python/test/Ice/operations/Collocated.py
@@ -38,13 +38,10 @@ try:
 
     initData.properties.setProperty("Ice.BatchAutoFlushSize", "100")
 
-    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/operations/Server.py b/python/test/Ice/operations/Server.py
index 6a0dc70da53..c2f68be89c0 100755
--- a/python/test/Ice/operations/Server.py
+++ b/python/test/Ice/operations/Server.py
@@ -35,13 +35,10 @@ try:
     # this warning.
     #
     initData.properties.setProperty("Ice.Warn.Dispatch", "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/operations/ServerAMD.py b/python/test/Ice/operations/ServerAMD.py
index cc950bb90ec..c603b9264b8 100755
--- a/python/test/Ice/operations/ServerAMD.py
+++ b/python/test/Ice/operations/ServerAMD.py
@@ -455,13 +455,10 @@ try:
     initData = Ice.InitializationData()
     initData.properties = Ice.createProperties(sys.argv)
     initData.properties.setProperty("Ice.Warn.Dispatch", "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/optional/Client.py b/python/test/Ice/optional/Client.py
index 3ebef40e6be..98b80f445ee 100755
--- a/python/test/Ice/optional/Client.py
+++ b/python/test/Ice/optional/Client.py
@@ -20,13 +20,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/optional/Server.py b/python/test/Ice/optional/Server.py
index c9182ac46a7..75843937efa 100755
--- a/python/test/Ice/optional/Server.py
+++ b/python/test/Ice/optional/Server.py
@@ -197,13 +197,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/optional/ServerAMD.py b/python/test/Ice/optional/ServerAMD.py
index 65f84d2f269..1659377060a 100755
--- a/python/test/Ice/optional/ServerAMD.py
+++ b/python/test/Ice/optional/ServerAMD.py
@@ -203,13 +203,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/proxy/Client.py b/python/test/Ice/proxy/Client.py
index 027a6eb070a..8b73fb8a670 100755
--- a/python/test/Ice/proxy/Client.py
+++ b/python/test/Ice/proxy/Client.py
@@ -32,13 +32,10 @@ def run(args, communicator):
 try:
     initData = Ice.InitializationData()
     initData.properties = Ice.createProperties(sys.argv)
-    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/proxy/Collocated.py b/python/test/Ice/proxy/Collocated.py
index bc240b8fc26..48f74175880 100755
--- a/python/test/Ice/proxy/Collocated.py
+++ b/python/test/Ice/proxy/Collocated.py
@@ -32,13 +32,10 @@ def run(args, communicator):
 try:
     initData = Ice.InitializationData()
     initData.properties = Ice.createProperties(sys.argv)
-    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/proxy/Server.py b/python/test/Ice/proxy/Server.py
index 4d2826e43a0..eb9dc15f064 100755
--- a/python/test/Ice/proxy/Server.py
+++ b/python/test/Ice/proxy/Server.py
@@ -32,13 +32,10 @@ try:
     initData = Ice.InitializationData()
     initData.properties = Ice.createProperties(sys.argv)
     initData.properties.setProperty("Ice.Warn.Dispatch", "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/proxy/ServerAMD.py b/python/test/Ice/proxy/ServerAMD.py
index 00a109ef7db..7cbc59a5662 100755
--- a/python/test/Ice/proxy/ServerAMD.py
+++ b/python/test/Ice/proxy/ServerAMD.py
@@ -49,13 +49,10 @@ try:
     initData.properties = Ice.createProperties(sys.argv)
     initData.properties.setProperty("Ice.Warn.Connections", "0")
     initData.properties.setProperty("Ice.Warn.Dispatch", "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/slicing/exceptions/Client.py b/python/test/Ice/slicing/exceptions/Client.py
index ef47308a897..9e7c832f104 100755
--- a/python/test/Ice/slicing/exceptions/Client.py
+++ b/python/test/Ice/slicing/exceptions/Client.py
@@ -18,13 +18,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/slicing/exceptions/Server.py b/python/test/Ice/slicing/exceptions/Server.py
index d77acfcccca..e31ccced5e8 100755
--- a/python/test/Ice/slicing/exceptions/Server.py
+++ b/python/test/Ice/slicing/exceptions/Server.py
@@ -163,13 +163,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/slicing/exceptions/ServerAMD.py b/python/test/Ice/slicing/exceptions/ServerAMD.py
index 8e821636a60..00a915508e3 100755
--- a/python/test/Ice/slicing/exceptions/ServerAMD.py
+++ b/python/test/Ice/slicing/exceptions/ServerAMD.py
@@ -224,13 +224,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/slicing/objects/Client.py b/python/test/Ice/slicing/objects/Client.py
index ef47308a897..9e7c832f104 100755
--- a/python/test/Ice/slicing/objects/Client.py
+++ b/python/test/Ice/slicing/objects/Client.py
@@ -18,13 +18,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/slicing/objects/Server.py b/python/test/Ice/slicing/objects/Server.py
index a8048d2bf8d..b17c73b57d7 100755
--- a/python/test/Ice/slicing/objects/Server.py
+++ b/python/test/Ice/slicing/objects/Server.py
@@ -376,13 +376,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/slicing/objects/ServerAMD.py b/python/test/Ice/slicing/objects/ServerAMD.py
index 1f925613b6b..1839a9f6480 100755
--- a/python/test/Ice/slicing/objects/ServerAMD.py
+++ b/python/test/Ice/slicing/objects/ServerAMD.py
@@ -412,13 +412,10 @@ def run(args, communicator):
     return True
 
 try:
-    communicator = Ice.initialize(sys.argv)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv) 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/timeout/Client.py b/python/test/Ice/timeout/Client.py
index f6695090351..343420bc121 100755
--- a/python/test/Ice/timeout/Client.py
+++ b/python/test/Ice/timeout/Client.py
@@ -58,13 +58,10 @@ try:
     #
     initData.properties.setProperty("Ice.TCP.SndSize", "50000");
 
-    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/timeout/Server.py b/python/test/Ice/timeout/Server.py
index d607016e64e..413a85b834a 100755
--- a/python/test/Ice/timeout/Server.py
+++ b/python/test/Ice/timeout/Server.py
@@ -65,13 +65,10 @@ try:
     # send() blocking after sending a given amount of data.
     #
     initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
-    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/Slice/escape/Client.py b/python/test/Slice/escape/Client.py
index 6305365602a..882e9739329 100755
--- a/python/test/Slice/escape/Client.py
+++ b/python/test/Slice/escape/Client.py
@@ -104,13 +104,10 @@ try:
     # this warning.
     #
     initData.properties.setProperty("Ice.Warn.Dispatch", "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/Slice/structure/Client.py b/python/test/Slice/structure/Client.py
index ee963021e65..ded72abdf7b 100755
--- a/python/test/Slice/structure/Client.py
+++ b/python/test/Slice/structure/Client.py
@@ -195,13 +195,10 @@ def run(args, communicator):
 try:
     initData = Ice.InitializationData()
     initData.properties = Ice.createProperties(sys.argv)
-    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)