From: Georg Brandl <georg@python.org>
Date: Thu, 23 Aug 2007 18:11:33 +0000 (+0000)
Subject: Use try-except-finally in contextlib.
X-Git-Tag: v2.6a1~1457
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac4018ae392459b6866ada5d0792d143d2c7cebc;p=python

Use try-except-finally in contextlib.
---

diff --git a/Lib/contextlib.py b/Lib/contextlib.py
index a807c42ce4..4f83ef6f32 100644
--- a/Lib/contextlib.py
+++ b/Lib/contextlib.py
@@ -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()