Use new form of with-statement instead of contextlib.nested().
diff --git a/Lib/test/support.py b/Lib/test/support.py
index bdc6b89..da81422 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -591,13 +591,11 @@
raise ResourceDenied("an optional resource is not available")
-def transient_internet():
- """Return a context manager that raises ResourceDenied when various issues
- with the Internet connection manifest themselves as exceptions."""
- time_out = TransientResource(IOError, errno=errno.ETIMEDOUT)
- socket_peer_reset = TransientResource(socket.error, errno=errno.ECONNRESET)
- ioerror_peer_reset = TransientResource(IOError, errno=errno.ECONNRESET)
- return contextlib.nested(time_out, socket_peer_reset, ioerror_peer_reset)
+# Context managers that raise ResourceDenied when various issues
+# with the Internet connection manifest themselves as exceptions.
+time_out = TransientResource(IOError, errno=errno.ETIMEDOUT)
+socket_peer_reset = TransientResource(socket.error, errno=errno.ECONNRESET)
+ioerror_peer_reset = TransientResource(IOError, errno=errno.ECONNRESET)
@contextlib.contextmanager
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 570526c..786bb41 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -146,8 +146,8 @@
# re-raises information about any exceptions the child
# throws. The real work happens in self.run_test().
os_done_r, os_done_w = os.pipe()
- with nested(closing(os.fdopen(os_done_r, 'rb')),
- closing(os.fdopen(os_done_w, 'wb'))) as (done_r, done_w):
+ with closing(os.fdopen(os_done_r, 'rb')) as done_r, \
+ closing(os.fdopen(os_done_w, 'wb')) as done_w:
child = os.fork()
if child == 0:
# In the child process; run the test and report results
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index c2da147..dc2d99d 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -174,7 +174,9 @@
(expected_err, url, req, type(err), err))
self.assert_(isinstance(err, expected_err), msg)
else:
- with support.transient_internet():
+ with support.time_out, \
+ support.socket_peer_reset, \
+ support.ioerror_peer_reset:
buf = f.read()
f.close()
debug("read %d bytes" % len(buf))