]> granicus.if.org Git - python/commitdiff
Silence a deprecation warning by using the appropriate replacement construct
authorNick Coghlan <ncoghlan@gmail.com>
Sun, 18 Oct 2009 10:29:10 +0000 (10:29 +0000)
committerNick Coghlan <ncoghlan@gmail.com>
Sun, 18 Oct 2009 10:29:10 +0000 (10:29 +0000)
Lib/test/test_support.py

index 048c527db943731d523288f494166d9016d20a83..d97e150c340608a3953f5031cee95300df199a9e 100644 (file)
@@ -630,13 +630,15 @@ class TransientResource(object):
                 raise ResourceDenied("an optional resource is not available")
 
 
+@contextlib.contextmanager
 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)
+    with time_out, socket_peer_reset, ioerror_peer_reset:
+        yield
 
 
 @contextlib.contextmanager