Hopiu/contextlib2
1
0
Fork 0
mirror of https://github.com/jazzband/contextlib2.git synced 2026-05-23 22:25:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Issue #5: ContextStack.register no longer pointlessly returns the wrapped function

Browse source
This commit is contained in:
Nick Coghlan 2012-01-03 23:58:00 +10:00
parent 7cab096ee8
commit 8bca9f8cd0
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NEWS.rst
View file

@ -5,6 +5,8 @@ Release History
0.3 (2012-01-XX) 0.3 (2012-01-XX)
~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
* Issue #5: ContextStack.register no longer pointlessly returns the wrapped
function
* Issue #2: Add examples and recipes section to docs * Issue #2: Add examples and recipes section to docs
* Issue #3: ContextStack.register_exit() now accepts objects with __exit__ * Issue #3: ContextStack.register_exit() now accepts objects with __exit__
attributes in addition to accepting exit callbacks directly attributes in addition to accepting exit callbacks directly

2
contextlib2.py
View file

@ -187,7 +187,7 @@ class ContextStack(object):
@wraps(callback) @wraps(callback)
def _wrapper(exc_type, exc, tb): def _wrapper(exc_type, exc, tb):
callback(*args, **kwds) callback(*args, **kwds)
return self.register_exit(_wrapper) self.register_exit(_wrapper)
def enter_context(self, cm): def enter_context(self, cm):
"""Enters the supplied context manager """Enters the supplied context manager

8
test_contextlib2.py
View file

@ -322,13 +322,13 @@ class TestContextStack(unittest.TestCase):
with ContextStack() as stack: with ContextStack() as stack:
for args, kwds in reversed(expected): for args, kwds in reversed(expected):
if args and kwds: if args and kwds:
stack.register(_exit, *args, **kwds) self.assertIsNone(stack.register(_exit, *args, **kwds))
elif args: elif args:
stack.register(_exit, *args) self.assertIsNone(stack.register(_exit, *args))
elif kwds: elif kwds:
stack.register(_exit, **kwds) self.assertIsNone(stack.register(_exit, **kwds))
else: else:
stack.register(_exit) self.assertIsNone(stack.register(_exit))
for wrapper in stack._callbacks: for wrapper in stack._callbacks:
self.assertEqual(wrapper.__name__, _exit.__name__) self.assertEqual(wrapper.__name__, _exit.__name__)
self.assertEqual(wrapper.__doc__, _exit.__doc__) self.assertEqual(wrapper.__doc__, _exit.__doc__)