First cut of ICE-6920 - Remove try/catch block around communicator destroy

58 files changed, 60 insertions, 292 deletions

diff --git a/python/test/Ice/acm/Client.py b/python/test/Ice/acm/Client.py
index b14e5063ddd..8e9586ab9f7 100755
--- a/python/test/Ice/acm/Client.py
+++ b/python/test/Ice/acm/Client.py
@@ -39,10 +39,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/acm/Server.py b/python/test/Ice/acm/Server.py
index 78f2486754b..2db5b7dece5 100755
--- a/python/test/Ice/acm/Server.py
+++ b/python/test/Ice/acm/Server.py
@@ -44,10 +44,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/admin/Client.py b/python/test/Ice/admin/Client.py
index 04d5e65ea29..8ad8e0d5fe3 100644
--- a/python/test/Ice/admin/Client.py
+++ b/python/test/Ice/admin/Client.py
@@ -35,10 +35,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/admin/Server.py b/python/test/Ice/admin/Server.py
index ebdd142b967..50b762fc9ec 100644
--- a/python/test/Ice/admin/Server.py
+++ b/python/test/Ice/admin/Server.py
@@ -37,10 +37,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/ami/Client.py b/python/test/Ice/ami/Client.py
index f09179c2893..d3a0275ffe2 100755
--- a/python/test/Ice/ami/Client.py
+++ b/python/test/Ice/ami/Client.py
@@ -47,10 +47,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/ami/Collocated.py b/python/test/Ice/ami/Collocated.py
index 062ff31f8fb..8336b26a3d9 100755
--- a/python/test/Ice/ami/Collocated.py
+++ b/python/test/Ice/ami/Collocated.py
@@ -31,7 +31,7 @@ def run(args, communicator):
 
     adapter.add(TestI.TestIntfI(), Ice.stringToIdentity("test"))
     #adapter.activate() # Collocated test doesn't need to active the OA
-    
+
     adapter2.add(testController, Ice.stringToIdentity("testController"))
     #adapter2.activate() # Collocated test doesn't need to active the OA
 
@@ -57,10 +57,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/ami/Server.py b/python/test/Ice/ami/Server.py
index a1c51251af5..c98543c93b2 100755
--- a/python/test/Ice/ami/Server.py
+++ b/python/test/Ice/ami/Server.py
@@ -59,10 +59,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/binding/Client.py b/python/test/Ice/binding/Client.py
index 4f30e65f8e9..c702a3752da 100755
--- a/python/test/Ice/binding/Client.py
+++ b/python/test/Ice/binding/Client.py
@@ -27,10 +27,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/binding/Server.py b/python/test/Ice/binding/Server.py
index e86495fecc4..5cfa8e9a7df 100755
--- a/python/test/Ice/binding/Server.py
+++ b/python/test/Ice/binding/Server.py
@@ -32,10 +32,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/blobject/Client.py b/python/test/Ice/blobject/Client.py
index c485d03acba..ce25b994c8c 100755
--- a/python/test/Ice/blobject/Client.py
+++ b/python/test/Ice/blobject/Client.py
@@ -64,11 +64,7 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 if status:
     try:
diff --git a/python/test/Ice/blobject/Server.py b/python/test/Ice/blobject/Server.py
index 9acab682de3..491f0ba9d8e 100755
--- a/python/test/Ice/blobject/Server.py
+++ b/python/test/Ice/blobject/Server.py
@@ -54,10 +54,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/checksum/Client.py b/python/test/Ice/checksum/Client.py
index b2806461ae4..ac14ef4820a 100755
--- a/python/test/Ice/checksum/Client.py
+++ b/python/test/Ice/checksum/Client.py
@@ -32,10 +32,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/checksum/Server.py b/python/test/Ice/checksum/Server.py
index 0f323f7e077..f2a074ad219 100755
--- a/python/test/Ice/checksum/Server.py
+++ b/python/test/Ice/checksum/Server.py
@@ -43,10 +43,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/custom/Client.py b/python/test/Ice/custom/Client.py
index d65f317b0b5..31d6c9f0d7c 100755
--- a/python/test/Ice/custom/Client.py
+++ b/python/test/Ice/custom/Client.py
@@ -27,10 +27,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/custom/Server.py b/python/test/Ice/custom/Server.py
index 46d1a70cda0..12621d40ca9 100755
--- a/python/test/Ice/custom/Server.py
+++ b/python/test/Ice/custom/Server.py
@@ -106,10 +106,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/defaultServant/Client.py b/python/test/Ice/defaultServant/Client.py
index 4f30e65f8e9..c702a3752da 100755
--- a/python/test/Ice/defaultServant/Client.py
+++ b/python/test/Ice/defaultServant/Client.py
@@ -27,10 +27,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/enums/Client.py b/python/test/Ice/enums/Client.py
index dcecb8bde02..cc50301dbf1 100755
--- a/python/test/Ice/enums/Client.py
+++ b/python/test/Ice/enums/Client.py
@@ -27,10 +27,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/enums/Server.py b/python/test/Ice/enums/Server.py
index 2c6c8292a16..40cc8eb8d7f 100755
--- a/python/test/Ice/enums/Server.py
+++ b/python/test/Ice/enums/Server.py
@@ -63,10 +63,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/exceptions/Client.py b/python/test/Ice/exceptions/Client.py
index 2febe36476c..a721c09b5e5 100755
--- a/python/test/Ice/exceptions/Client.py
+++ b/python/test/Ice/exceptions/Client.py
@@ -36,10 +36,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/exceptions/Collocated.py b/python/test/Ice/exceptions/Collocated.py
index b1dc368a161..555805a08db 100755
--- a/python/test/Ice/exceptions/Collocated.py
+++ b/python/test/Ice/exceptions/Collocated.py
@@ -43,10 +43,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/exceptions/Server.py b/python/test/Ice/exceptions/Server.py
index a3556e7f439..3cb70a97161 100755
--- a/python/test/Ice/exceptions/Server.py
+++ b/python/test/Ice/exceptions/Server.py
@@ -51,10 +51,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/exceptions/ServerAMD.py b/python/test/Ice/exceptions/ServerAMD.py
index ef4511a383b..21238afdcf8 100755
--- a/python/test/Ice/exceptions/ServerAMD.py
+++ b/python/test/Ice/exceptions/ServerAMD.py
@@ -182,10 +182,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/facets/Client.py b/python/test/Ice/facets/Client.py
index 79389c9dfb6..07b46c03e43 100755
--- a/python/test/Ice/facets/Client.py
+++ b/python/test/Ice/facets/Client.py
@@ -28,10 +28,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/facets/Collocated.py b/python/test/Ice/facets/Collocated.py
index 5936768fbdc..7b0734c6801 100755
--- a/python/test/Ice/facets/Collocated.py
+++ b/python/test/Ice/facets/Collocated.py
@@ -39,10 +39,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/facets/Server.py b/python/test/Ice/facets/Server.py
index e00238e0834..293b1a24bdc 100755
--- a/python/test/Ice/facets/Server.py
+++ b/python/test/Ice/facets/Server.py
@@ -38,10 +38,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/faultTolerance/Client.py b/python/test/Ice/faultTolerance/Client.py
index 8c5b02bdebc..2148c01553b 100755
--- a/python/test/Ice/faultTolerance/Client.py
+++ b/python/test/Ice/faultTolerance/Client.py
@@ -58,10 +58,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/faultTolerance/Server.py b/python/test/Ice/faultTolerance/Server.py
index e0f0a1e4cdc..6e4b6fe0fc4 100755
--- a/python/test/Ice/faultTolerance/Server.py
+++ b/python/test/Ice/faultTolerance/Server.py
@@ -76,10 +76,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/info/Client.py b/python/test/Ice/info/Client.py
index 2c33651a220..8d395d34d36 100755
--- a/python/test/Ice/info/Client.py
+++ b/python/test/Ice/info/Client.py
@@ -37,10 +37,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/info/Server.py b/python/test/Ice/info/Server.py
index 1c6057ce26c..63dfac1ebd0 100755
--- a/python/test/Ice/info/Server.py
+++ b/python/test/Ice/info/Server.py
@@ -37,10 +37,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/inheritance/Client.py b/python/test/Ice/inheritance/Client.py
index af8035a4634..5d978d0bb61 100755
--- a/python/test/Ice/inheritance/Client.py
+++ b/python/test/Ice/inheritance/Client.py
@@ -27,10 +27,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/inheritance/Collocated.py b/python/test/Ice/inheritance/Collocated.py
index cca4200f26e..5fd18d1b4c6 100755
--- a/python/test/Ice/inheritance/Collocated.py
+++ b/python/test/Ice/inheritance/Collocated.py
@@ -33,10 +33,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/inheritance/Server.py b/python/test/Ice/inheritance/Server.py
index 3415ad4519d..027ff3b5e80 100755
--- a/python/test/Ice/inheritance/Server.py
+++ b/python/test/Ice/inheritance/Server.py
@@ -31,10 +31,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/location/Client.py b/python/test/Ice/location/Client.py
index affc95ee1ff..71418f137a6 100755
--- a/python/test/Ice/location/Client.py
+++ b/python/test/Ice/location/Client.py
@@ -38,10 +38,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/location/Server.py b/python/test/Ice/location/Server.py
index debd8d06d28..b9e8f55e9ad 100755
--- a/python/test/Ice/location/Server.py
+++ b/python/test/Ice/location/Server.py
@@ -89,7 +89,7 @@ class ServerManagerI(Test.ServerManager):
         self._initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2")
 
     def startServer(self, current=None):
-      
+
         #
         # Simulate a server: create a new communicator and object
         # adapter. The object adapter is started on a system allocated
@@ -190,10 +190,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/objects/Client.py b/python/test/Ice/objects/Client.py
index 3f840b93b3c..6cd16ce186d 100755
--- a/python/test/Ice/objects/Client.py
+++ b/python/test/Ice/objects/Client.py
@@ -28,10 +28,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/objects/Collocated.py b/python/test/Ice/objects/Collocated.py
index 02570bc35a9..ca2c54b22bc 100755
--- a/python/test/Ice/objects/Collocated.py
+++ b/python/test/Ice/objects/Collocated.py
@@ -39,10 +39,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/objects/Server.py b/python/test/Ice/objects/Server.py
index 89b440c6845..b986603ccdf 100755
--- a/python/test/Ice/objects/Server.py
+++ b/python/test/Ice/objects/Server.py
@@ -47,10 +47,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/operations/Client.py b/python/test/Ice/operations/Client.py
index 285ab3a40d3..650cc34ebf3 100755
--- a/python/test/Ice/operations/Client.py
+++ b/python/test/Ice/operations/Client.py
@@ -56,10 +56,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/operations/Collocated.py b/python/test/Ice/operations/Collocated.py
index 757d5089247..02d35848c0c 100755
--- a/python/test/Ice/operations/Collocated.py
+++ b/python/test/Ice/operations/Collocated.py
@@ -45,10 +45,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/operations/Server.py b/python/test/Ice/operations/Server.py
index 3c740d9504e..6a0dc70da53 100755
--- a/python/test/Ice/operations/Server.py
+++ b/python/test/Ice/operations/Server.py
@@ -42,10 +42,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/operations/ServerAMD.py b/python/test/Ice/operations/ServerAMD.py
index 3204be386dc..b2e96b39c96 100755
--- a/python/test/Ice/operations/ServerAMD.py
+++ b/python/test/Ice/operations/ServerAMD.py
@@ -462,10 +462,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/optional/Client.py b/python/test/Ice/optional/Client.py
index a3c6610a4e9..3ebef40e6be 100755
--- a/python/test/Ice/optional/Client.py
+++ b/python/test/Ice/optional/Client.py
@@ -27,10 +27,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/optional/Server.py b/python/test/Ice/optional/Server.py
index 7dac81076cd..2db847e0b77 100755
--- a/python/test/Ice/optional/Server.py
+++ b/python/test/Ice/optional/Server.py
@@ -204,10 +204,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/optional/ServerAMD.py b/python/test/Ice/optional/ServerAMD.py
index a9bbda70c9b..d9cc9a9bb4a 100755
--- a/python/test/Ice/optional/ServerAMD.py
+++ b/python/test/Ice/optional/ServerAMD.py
@@ -210,10 +210,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/proxy/Client.py b/python/test/Ice/proxy/Client.py
index ae4f2e69fbc..027a6eb070a 100755
--- a/python/test/Ice/proxy/Client.py
+++ b/python/test/Ice/proxy/Client.py
@@ -39,10 +39,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/proxy/Collocated.py b/python/test/Ice/proxy/Collocated.py
index 26574d5b64e..bc240b8fc26 100755
--- a/python/test/Ice/proxy/Collocated.py
+++ b/python/test/Ice/proxy/Collocated.py
@@ -39,10 +39,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/proxy/Server.py b/python/test/Ice/proxy/Server.py
index 33ec4916591..4d2826e43a0 100755
--- a/python/test/Ice/proxy/Server.py
+++ b/python/test/Ice/proxy/Server.py
@@ -39,10 +39,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/proxy/ServerAMD.py b/python/test/Ice/proxy/ServerAMD.py
index 218e8f7d596..b2f71d6fcfa 100755
--- a/python/test/Ice/proxy/ServerAMD.py
+++ b/python/test/Ice/proxy/ServerAMD.py
@@ -56,10 +56,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    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 8192d820458..ef47308a897 100755
--- a/python/test/Ice/slicing/exceptions/Client.py
+++ b/python/test/Ice/slicing/exceptions/Client.py
@@ -25,10 +25,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    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 da672a90a7d..29834507e62 100755
--- a/python/test/Ice/slicing/exceptions/Server.py
+++ b/python/test/Ice/slicing/exceptions/Server.py
@@ -170,10 +170,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    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 5dd7386d670..6be6fbe5c03 100755
--- a/python/test/Ice/slicing/exceptions/ServerAMD.py
+++ b/python/test/Ice/slicing/exceptions/ServerAMD.py
@@ -231,10 +231,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    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 8192d820458..ef47308a897 100755
--- a/python/test/Ice/slicing/objects/Client.py
+++ b/python/test/Ice/slicing/objects/Client.py
@@ -25,10 +25,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    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 53b522a6462..909e836bff4 100755
--- a/python/test/Ice/slicing/objects/Server.py
+++ b/python/test/Ice/slicing/objects/Server.py
@@ -383,10 +383,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    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 fc5f63ca732..db617dd50e1 100755
--- a/python/test/Ice/slicing/objects/ServerAMD.py
+++ b/python/test/Ice/slicing/objects/ServerAMD.py
@@ -419,10 +419,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/timeout/Client.py b/python/test/Ice/timeout/Client.py
index 47ce75ea8a5..f6695090351 100755
--- a/python/test/Ice/timeout/Client.py
+++ b/python/test/Ice/timeout/Client.py
@@ -65,10 +65,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Ice/timeout/Server.py b/python/test/Ice/timeout/Server.py
index 1a1b52014cc..4db8d04b78f 100755
--- a/python/test/Ice/timeout/Server.py
+++ b/python/test/Ice/timeout/Server.py
@@ -72,10 +72,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Slice/escape/Client.py b/python/test/Slice/escape/Client.py
index 9838c64eb17..e3da840e300 100755
--- a/python/test/Slice/escape/Client.py
+++ b/python/test/Slice/escape/Client.py
@@ -111,10 +111,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)
diff --git a/python/test/Slice/structure/Client.py b/python/test/Slice/structure/Client.py
index 9bda6073cf9..ee963021e65 100755
--- a/python/test/Slice/structure/Client.py
+++ b/python/test/Slice/structure/Client.py
@@ -202,10 +202,6 @@ except:
     status = False
 
 if communicator:
-    try:
-        communicator.destroy()
-    except:
-        traceback.print_exc()
-        status = False
+    communicator.destroy()
 
 sys.exit(not status)