Use new form of with-statement instead of contextlib.nested(). · python/cpython@686057b · GitHub
Skip to content

Commit 686057b

Browse files
rhettingerrhettinger
committed
Use new form of with-statement instead of contextlib.nested().
1 parent a678d94 commit 686057b

4 files changed

Lines changed: 11 additions & 12 deletions

File tree

‎Lib/filecmp.py‎

Lines changed: 1 addition & 2 deletions

‎Lib/test/support.py‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -591,13 +591,11 @@ def __exit__(self, type_=None, value=None, traceback=None):
591591
raise ResourceDenied("an optional resource is not available")
592592

593593

594-
def transient_internet():
595-
"""Return a context manager that raises ResourceDenied when various issues
596-
with the Internet connection manifest themselves as exceptions."""
597-
time_out = TransientResource(IOError, errno=errno.ETIMEDOUT)
598-
socket_peer_reset = TransientResource(socket.error, errno=errno.ECONNRESET)
599-
ioerror_peer_reset = TransientResource(IOError, errno=errno.ECONNRESET)
600-
return contextlib.nested(time_out, socket_peer_reset, ioerror_peer_reset)
594+
# Context managers that raise ResourceDenied when various issues
595+
# with the Internet connection manifest themselves as exceptions.
596+
time_out = TransientResource(IOError, errno=errno.ETIMEDOUT)
597+
socket_peer_reset = TransientResource(socket.error, errno=errno.ECONNRESET)
598+
ioerror_peer_reset = TransientResource(IOError, errno=errno.ECONNRESET)
601599

602600

603601
@contextlib.contextmanager

‎Lib/test/test_signal.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ def test_main(self):
146146
# re-raises information about any exceptions the child
147147
# throws. The real work happens in self.run_test().
148148
os_done_r, os_done_w = os.pipe()
149-
with nested(closing(os.fdopen(os_done_r, 'rb')),
150-
closing(os.fdopen(os_done_w, 'wb'))) as (done_r, done_w):
149+
with closing(os.fdopen(os_done_r, 'rb')) as done_r, \
150+
closing(os.fdopen(os_done_w, 'wb')) as done_w:
151151
child = os.fork()
152152
if child == 0:
153153
# In the child process; run the test and report results

‎Lib/test/test_urllib2net.py‎

Lines changed: 3 additions & 1 deletion

0 commit comments

Comments
 (0)