[Numpy-svn] r3740 - trunk/numpy/distutils

[numpy-svn at scipy.org]

Author: cookedm
Date: 2007-05-10 12:26:20 -0500 (Thu, 10 May 2007)
New Revision: 3740

Modified:
   trunk/numpy/distutils/core.py
Log:
Use a try/finally instead of try/except Exception for cleanup in numpy/distutils/core.py


Modified: trunk/numpy/distutils/core.py
===================================================================
--- trunk/numpy/distutils/core.py	2007-05-10 17:24:44 UTC (rev 3739)
+++ trunk/numpy/distutils/core.py	2007-05-10 17:26:20 UTC (rev 3740)
@@ -130,19 +130,17 @@
         distutils.core._setup_stop_after = "commandline"
         try:
             dist = setup(**new_attr)
+        finally:
             distutils.core._setup_distribution = old_dist
             distutils.core._setup_stop_after = old_stop
-        except Exception,msg:
-            distutils.core._setup_distribution = old_dist
-            distutils.core._setup_stop_after = old_stop
-            raise msg
         if dist.help or not _command_line_ok():
             # probably displayed help, skip running any commands
             return dist
 
         # create setup dictionary and append to new_attr
         config = configuration()
-        if hasattr(config,'todict'): config = config.todict()
+        if hasattr(config,'todict'):
+            config = config.todict()
         _dict_append(new_attr, **config)
 
     # Move extension source libraries to libraries