mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #24336: The contextmanager decorator now works with functions with

Browse source 
keyword arguments called "func" and "self".  Patch by Martin Panter.
This commit is contained in:
Serhiy Storchaka 2015-06-28 17:06:07 +03:00
parent acac1e0e3b
commit 101ff3541c
4 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/contextlib.py
View file

@ -34,7 +34,7 @@ class ContextDecorator(object):
class _GeneratorContextManager(ContextDecorator):
"""Helper for @contextmanager decorator."""
def __init__(self, func, *args, **kwds):
def __init__(self, func, args, kwds):
self.gen = func(*args, **kwds)
self.func, self.args, self.kwds = func, args, kwds
# Issue 19330: ensure context manager instances have good docstrings
@ -52,7 +52,7 @@ class _GeneratorContextManager(ContextDecorator):
# _GCM instances are one-shot context managers, so the
# CM must be recreated each time a decorated function is
# called
return self.__class__(self.func, *self.args, **self.kwds)
return self.__class__(self.func, self.args, self.kwds)
def __enter__(self):
try:
@ -123,7 +123,7 @@ def contextmanager(func):
"""
@wraps(func)
def helper(*args, **kwds):
return _GeneratorContextManager(func, *args, **kwds)
return _GeneratorContextManager(func, args, kwds)
return helper