summaryrefslogtreecommitdiffstats
path: root/Lib/contextlib.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/contextlib.py')
-rw-r--r--Lib/contextlib.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/contextlib.py b/Lib/contextlib.py
index c018895..5371a9f 100644
--- a/Lib/contextlib.py
+++ b/Lib/contextlib.py
@@ -65,7 +65,7 @@ class _GeneratorContextManager(ContextDecorator):
try:
next(self.gen)
except StopIteration:
- return
+ return False
else:
raise RuntimeError("generator didn't stop")
else:
@@ -87,7 +87,7 @@ class _GeneratorContextManager(ContextDecorator):
# Likewise, avoid suppressing if a StopIteration exception
# was passed to throw() and later wrapped into a RuntimeError
# (see PEP 479).
- if exc.__cause__ is value:
+ if type is StopIteration and exc.__cause__ is value:
return False
raise
except:
@@ -98,10 +98,10 @@ class _GeneratorContextManager(ContextDecorator):
# fixes the impedance mismatch between the throw() protocol
# and the __exit__() protocol.
#
- if sys.exc_info()[1] is not value:
- raise
- else:
- raise RuntimeError("generator didn't stop after throw()")
+ if sys.exc_info()[1] is value:
+ return False
+ raise
+ raise RuntimeError("generator didn't stop after throw()")
def contextmanager(func):