Skip to content

Preserve return values from generator callers #191

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

Open
xiehuanyi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve return values from generator callers #191

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/decorator/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ async def async_fun(*args, **kw):
def generator_fun(*args, **kw):
if not kwsyntax:
args, kw = fix(args, kw, sig)
yield from caller(func, *(extras + args), **kw)
return (yield from caller(func, *(extras + args), **kw))
fun = generator_fun
else:
def sync_fun(*args, **kw):
Expand Down
17 changes: 17 additions & 0 deletions tests/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,23 @@ def square(func, *args, **kw):
self.assertEqual(list(new()), [1, 4, 9])


def test_generator_return_value(self):
@decorator
def identity(func, *args, **kw):
return (yield from func(*args, **kw))

@identity
def numbers():
yield 1
return 42

gen = numbers()
self.assertEqual(next(gen), 1)
with self.assertRaises(StopIteration) as caught:
next(gen)
self.assertEqual(caught.exception.value, 42)


class DocumentationTestCase(unittest.TestCase):
def test(self):
err = doctest.testmod(doc)[0]
Expand Down