[pypy-svn] r70150 - pypy/branch/import-builtin/pypy/module/imp

[afa at codespeak.net]

Author: afa
Date: Wed Dec 16 17:39:17 2009
New Revision: 70150

Modified:
   pypy/branch/import-builtin/pypy/module/imp/importing.py
Log:
python2.4 does not parse try...except...finally


Modified: pypy/branch/import-builtin/pypy/module/imp/importing.py
==============================================================================
--- pypy/branch/import-builtin/pypy/module/imp/importing.py	(original)
+++ pypy/branch/import-builtin/pypy/module/imp/importing.py	Wed Dec 16 17:39:17 2009
@@ -444,15 +444,16 @@
         raise OperationError(space.w_ImportError, space.wrap(msg))
 
     try:
-        return load_module(space, w_modulename, find_info, reuse=True)
+        try:
+            return load_module(space, w_modulename, find_info, reuse=True)
+        finally:
+            if find_info.stream:
+                find_info.stream.close()
     except:
         # load_module probably removed name from modules because of
         # the error.  Put back the original module object.
         space.sys.setmodule(w_module)
         raise
-    finally:
-        if find_info.stream:
-            find_info.stream.close()
 
 
 # __________________________________________________________________