Skip to content

[3.12] Synchronize test_contextlib with test_contextlib_async (GH-111000) #111114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 21, 2023
Merged

[3.12] Synchronize test_contextlib with test_contextlib_async (GH-111000) #111114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions Lib/test/test_contextlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,15 @@ def whoo():
# The "gen" attribute is an implementation detail.
self.assertFalse(ctx.gen.gi_suspended)

def test_contextmanager_trap_no_yield(self):
@contextmanager
def whoo():
if False:
yield
ctx = whoo()
with self.assertRaises(RuntimeError):
ctx.__enter__()

def test_contextmanager_trap_second_yield(self):
@contextmanager
def whoo():
Expand All @@ -176,6 +185,19 @@ def whoo():
# The "gen" attribute is an implementation detail.
self.assertFalse(ctx.gen.gi_suspended)

def test_contextmanager_non_normalised(self):
@contextmanager
def whoo():
try:
yield
except RuntimeError:
raise SyntaxError

ctx = whoo()
ctx.__enter__()
with self.assertRaises(SyntaxError):
ctx.__exit__(RuntimeError, None, None)

def test_contextmanager_except(self):
state = []
@contextmanager
Expand Down Expand Up @@ -255,6 +277,25 @@ def test_issue29692():
self.assertEqual(ex.args[0], 'issue29692:Unchained')
self.assertIsNone(ex.__cause__)

def test_contextmanager_wrap_runtimeerror(self):
@contextmanager
def woohoo():
try:
yield
except Exception as exc:
raise RuntimeError(f'caught {exc}') from exc

with self.assertRaises(RuntimeError):
with woohoo():
1 / 0

# If the context manager wrapped StopIteration in a RuntimeError,
# we also unwrap it, because we can't tell whether the wrapping was
# done by the generator machinery or by the generator itself.
with self.assertRaises(StopIteration):
with woohoo():
raise StopIteration

def _create_contextmanager_attribs(self):
def attribs(**kw):
def decorate(func):
Expand All @@ -266,6 +307,7 @@ def decorate(func):
@attribs(foo='bar')
def baz(spam):
"""Whee!"""
yield
return baz

def test_contextmanager_attribs(self):
Expand Down Expand Up @@ -322,8 +364,11 @@ def woohoo(a, *, b):

def test_recursive(self):
depth = 0
ncols = 0
@contextmanager
def woohoo():
nonlocal ncols
ncols += 1
nonlocal depth
before = depth
depth += 1
Expand All @@ -337,6 +382,7 @@ def recursive():
recursive()

recursive()
self.assertEqual(ncols, 10)
self.assertEqual(depth, 0)


Expand Down