]> granicus.if.org Git - python/commitdiff
Use try-except-finally in contextlib.
authorGeorg Brandl <georg@python.org>
Thu, 23 Aug 2007 18:11:33 +0000 (18:11 +0000)
committerGeorg Brandl <georg@python.org>
Thu, 23 Aug 2007 18:11:33 +0000 (18:11 +0000)
Lib/contextlib.py

index a807c42ce47561c6a05f42123ad7e5582f02c4c2..4f83ef6f32fa38480e7ca27fed80b45e0abe8c1a 100644 (file)
@@ -105,15 +105,14 @@ def nested(*managers):
     vars = []
     exc = (None, None, None)
     try:
-        try:
-            for mgr in managers:
-                exit = mgr.__exit__
-                enter = mgr.__enter__
-                vars.append(enter())
-                exits.append(exit)
-            yield vars
-        except:
-            exc = sys.exc_info()
+        for mgr in managers:
+            exit = mgr.__exit__
+            enter = mgr.__enter__
+            vars.append(enter())
+            exits.append(exit)
+        yield vars
+    except:
+        exc = sys.exc_info()
     finally:
         while exits:
             exit = exits.pop()