diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py index 46e91f65d86..2806ea8dc90 100644 --- a/Lib/asyncio/unix_events.py +++ b/Lib/asyncio/unix_events.py @@ -39,6 +39,13 @@ def _sighandler_noop(signum, frame): pass +try: + _fspath = os.fspath +except AttributeError: + # Python 3.5 or earlier + _fspath = lambda path: path + + class _UnixSelectorEventLoop(selector_events.BaseSelectorEventLoop): """Unix event loop. @@ -256,6 +263,7 @@ def create_unix_server(self, protocol_factory, path=None, *, raise ValueError( 'path and sock can not be specified at the same time') + path = _fspath(path) sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) # Check for abstract socket. `str` and `bytes` paths are supported. diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py index 89c6eed602b..5a499841352 100644 --- a/Lib/test/test_asyncio/test_unix_events.py +++ b/Lib/test/test_asyncio/test_unix_events.py @@ -4,6 +4,7 @@ import errno import io import os +import pathlib import signal import socket import stat @@ -251,6 +252,15 @@ def test_create_unix_server_existing_path_sock(self): srv.close() self.loop.run_until_complete(srv.wait_closed()) + @unittest.skipUnless(hasattr(os, 'fspath'), 'no os.fspath') + def test_create_unix_server_pathlib(self): + with test_utils.unix_socket_path() as path: + path = pathlib.Path(path) + srv_coro = self.loop.create_unix_server(lambda: None, path) + srv = self.loop.run_until_complete(srv_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: coro = self.loop.create_unix_server(lambda: None, file.name) diff --git a/Misc/NEWS b/Misc/NEWS index 1449f5648b8..a3db6e4a759 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -60,6 +60,9 @@ Library - Issue #28703: Fix asyncio.iscoroutinefunction to handle Mock objects. +- Issue #28704: Fix create_unix_server to support Path-like objects + (PEP 519). + Documentation -------------