(original) (raw)

changeset: 105135:0d663f758adb branch: 3.6 parent: 105132:4d78290b1d8e parent: 105134:f8207c98eb5e user: Yury Selivanov yury@magic.io date: Tue Nov 15 15:27:23 2016 -0500 files: Lib/asyncio/unix_events.py Misc/NEWS description: Merge 3.5 (issue #28704) diff -r 4d78290b1d8e -r 0d663f758adb Lib/asyncio/unix_events.py --- a/Lib/asyncio/unix_events.py Tue Nov 15 15:21:07 2016 -0500 +++ b/Lib/asyncio/unix_events.py Tue Nov 15 15:27:23 2016 -0500 @@ -39,6 +39,13 @@ 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 @@ 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 -r 4d78290b1d8e -r 0d663f758adb Lib/test/test_asyncio/test_unix_events.py --- a/Lib/test/test_asyncio/test_unix_events.py Tue Nov 15 15:21:07 2016 -0500 +++ b/Lib/test/test_asyncio/test_unix_events.py Tue Nov 15 15:27:23 2016 -0500 @@ -4,6 +4,7 @@ import errno import io import os +import pathlib import signal import socket import stat @@ -251,6 +252,15 @@ 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 -r 4d78290b1d8e -r 0d663f758adb Misc/NEWS --- a/Misc/NEWS Tue Nov 15 15:21:07 2016 -0500 +++ b/Misc/NEWS Tue Nov 15 15:27:23 2016 -0500 @@ -60,6 +60,9 @@ - Issue #28703: Fix asyncio.iscoroutinefunction to handle Mock objects. +- Issue #28704: Fix create_unix_server to support Path-like objects + (PEP 519). + Documentation ------------- /yury@magic.io