(original) (raw)

changeset: 104414:a3b162d5e70a branch: 3.5 parent: 104411:94c9c314f5d9 user: Yury Selivanov yury@magic.io date: Sun Oct 09 12:15:08 2016 -0400 files: Lib/asyncio/unix_events.py Lib/test/test_asyncio/test_unix_events.py Misc/NEWS description: Issue #28399: Remove UNIX socket from FS before binding. Patch by Коренберг Марк. diff -r 94c9c314f5d9 -r a3b162d5e70a Lib/asyncio/unix_events.py --- a/Lib/asyncio/unix_events.py Sun Oct 09 18🔞21 2016 +0300 +++ b/Lib/asyncio/unix_events.py Sun Oct 09 12:15:08 2016 -0400 @@ -258,6 +258,17 @@ sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + # Check for abstract socket. `str` and `bytes` paths are supported. + if path[0] not in (0, '\x00'): + try: + if stat.S_ISSOCK(os.stat(path).st_mode): + os.remove(path) + except FileNotFoundError: + pass + except OSError as err: + # Directory may have permissions only to create socket. + logger.error('Unable to check or remove stale UNIX socket %r: %r', path, err) + try: sock.bind(path) except OSError as exc: diff -r 94c9c314f5d9 -r a3b162d5e70a Lib/test/test_asyncio/test_unix_events.py --- a/Lib/test/test_asyncio/test_unix_events.py Sun Oct 09 18🔞21 2016 +0300 +++ b/Lib/test/test_asyncio/test_unix_events.py Sun Oct 09 12:15:08 2016 -0400 @@ -241,11 +241,13 @@ with test_utils.unix_socket_path() as path: sock = socket.socket(socket.AF_UNIX) sock.bind(path) - with sock: - coro = self.loop.create_unix_server(lambda: None, path) - with self.assertRaisesRegex(OSError, - 'Address.*is already in use'): - self.loop.run_until_complete(coro) + sock.listen(1) + sock.close() + + coro = self.loop.create_unix_server(lambda: None, path) + srv = self.loop.run_until_complete(coro) + srv.close() + self.loop.run_until_complete(srv.wait_closed()) def test_create_unix_server_existing_path_nonsock(self): with tempfile.NamedTemporaryFile() as file: diff -r 94c9c314f5d9 -r a3b162d5e70a Misc/NEWS --- a/Misc/NEWS Sun Oct 09 18🔞21 2016 +0300 +++ b/Misc/NEWS Sun Oct 09 12:15:08 2016 -0400 @@ -385,6 +385,9 @@ - Issue #28372: Fix asyncio to support formatting of non-python coroutines. +- Issue #28399: Remove UNIX socket from FS before binding. + Patch by Коренберг Марк. + IDLE ---- /yury@magic.io