merge bug23645 into default (C client is lacking some methods in its API)

1 files changed, 7 insertions, 7 deletions

diff --git a/amqp_codegen.py b/amqp_codegen.py
index cbfdcf8..c6c6a5f 100644
--- a/amqp_codegen.py
+++ b/amqp_codegen.py
@@ -32,7 +32,7 @@
 from __future__ import nested_scopes
 import re
 import sys
-from os import remove
+import os
 from optparse import OptionParser
 
 try:
@@ -271,16 +271,16 @@ def do_main_dict(funcDict):
     def execute(fn, amqp_specs, out_file):
         stdout = sys.stdout
         f = open(out_file, 'w')
+        success = False
         try:
-            try:
-                sys.stdout = f
-                fn(amqp_specs)
-            except:
-                remove(out_file)
-                raise
+            sys.stdout = f
+            fn(amqp_specs)
+            success = True
         finally:
             sys.stdout = stdout
             f.close()
+            if not success:
+                os.remove(out_file)
 
     parser = OptionParser()
     parser.add_option("--ignore-conflicts", action="store_true", dest="ignore_conflicts", default=False)