Commit 554290d9 authored by Raymond Hettinger's avatar Raymond Hettinger

Fixup/simplify another nested context manager.

parent 680bf1af
from .. import util from .. import util
from . import util as import_util from . import util as import_util
from contextlib import nested
from types import MethodType from types import MethodType
import unittest import unittest
...@@ -18,8 +17,7 @@ class CallingOrder(unittest.TestCase): ...@@ -18,8 +17,7 @@ class CallingOrder(unittest.TestCase):
mod = 'top_level' mod = 'top_level'
first = util.mock_modules(mod) first = util.mock_modules(mod)
second = util.mock_modules(mod) second = util.mock_modules(mod)
context = nested(util.mock_modules(mod), util.mock_modules(mod)) with util.mock_modules(mod) as first, util.mock_modules(mod) as second:
with context as (first, second):
first.modules[mod] = 42 first.modules[mod] = 42
second.modules[mod] = -13 second.modules[mod] = -13
with util.import_state(meta_path=[first, second]): with util.import_state(meta_path=[first, second]):
...@@ -28,9 +26,8 @@ class CallingOrder(unittest.TestCase): ...@@ -28,9 +26,8 @@ class CallingOrder(unittest.TestCase):
def test_continuing(self): def test_continuing(self):
# [continuing] # [continuing]
mod_name = 'for_real' mod_name = 'for_real'
first = util.mock_modules('nonexistent') with util.mock_modules('nonexistent') as first, \
second = util.mock_modules(mod_name) util.mock_modules(mod_name) as second:
with nested(first, second):
first.find_module = lambda self, fullname, path=None: None first.find_module = lambda self, fullname, path=None: None
second.modules[mod_name] = 42 second.modules[mod_name] = 42
with util.import_state(meta_path=[first, second]): with util.import_state(meta_path=[first, second]):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment