Skip to content
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

Minor Python 3.5+ improvements #73

Open
wants to merge 2 commits into
base: req_py3
Choose a base branch
from
Open

Minor Python 3.5+ improvements #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18a4731
Fix test_tasks for Python 3
Stealthii Jun 29, 2021
d457d9c
Implement nested using contextmanager
Stealthii Jun 29, 2021
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
12 changes: 7 additions & 5 deletions fabric/context_managers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@
from fabric.utils import isatty


class nested(ExitStack):
def __init__(self, *managers):
super(nested, self).__init__()
for manager in managers:
self.enter_context(manager)
@contextmanager
def nested(*contexts):
"""Reimplementation of nested in Python 3."""
with ExitStack() as stack:
for ctx in contexts:
stack.enter_context(ctx)
yield contexts


if not win32:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def dict_contains(superset, subset):
"""
Assert that all key/val pairs in dict 'subset' also exist in 'superset'
"""
for key, value in subset.iteritems():
for key, value in subset.items():
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hah - this wasn't noticed before, because nothing has used this helper function since 2011 (usage removed in 0194237)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... if you open a pull request against the master branch which just deletes this function, I'd merge it :)

ok_(key in superset)
eq_(superset[key], value)

Expand Down