From 697ce5560fec5bb3207f3d975e34dc6a702016ec Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sun, 16 Dec 2012 16:09:11 +0100 Subject: [PATCH] Fix ResourceWarnings in test_pty --- Lib/test/test_pty.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py index 4f1251cd368..fcebce78e85 100644 --- a/Lib/test/test_pty.py +++ b/Lib/test/test_pty.py @@ -215,7 +215,7 @@ class SmallPtyTests(unittest.TestCase): for fd in self.fds: try: os.close(fd) - except: + except OSError: pass def _pipe(self): @@ -235,8 +235,9 @@ class SmallPtyTests(unittest.TestCase): mock_stdin_fd, write_to_stdin_fd = self._pipe() pty.STDIN_FILENO = mock_stdin_fd socketpair = socket.socketpair() + for s in socketpair: + self.addCleanup(s.close) masters = [s.fileno() for s in socketpair] - self.fds.extend(masters) # Feed data. Smaller than PIPEBUF. These writes will not block. os.write(masters[1], b'from master') @@ -264,8 +265,9 @@ class SmallPtyTests(unittest.TestCase): mock_stdin_fd, write_to_stdin_fd = self._pipe() pty.STDIN_FILENO = mock_stdin_fd socketpair = socket.socketpair() + for s in socketpair: + self.addCleanup(s.close) masters = [s.fileno() for s in socketpair] - self.fds.extend(masters) os.close(masters[1]) socketpair[1].close()