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

1 files changed, 14 insertions, 24 deletions

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)