From: Phillip J. Eby Date: Mon, 10 Apr 2006 17:56:29 +0000 (+0000) Subject: Minor clarity edit to contextlib per Guido's request. X-Git-Tag: v2.5a2~369 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93149d935d08c5ea1c21ebc74d11016026c0a6b6;p=python Minor clarity edit to contextlib per Guido's request. --- diff --git a/Lib/contextlib.py b/Lib/contextlib.py index 418a3b7820..aa5335d9c4 100644 --- a/Lib/contextlib.py +++ b/Lib/contextlib.py @@ -31,11 +31,11 @@ class GeneratorContextManager(object): try: self.gen.throw(type, value, traceback) raise RuntimeError("generator didn't stop after throw()") - except StopIteration: + except StopIteration, exc: # Suppress the exception *unless* it's the same exception that # was passed to throw(). This prevents a StopIteration # raised inside the "with" statement from being suppressed - return sys.exc_info()[1] is not value + return exc is not value except: # only re-raise if it's *not* the exception that was # passed to throw(), because __exit__() must not raise