Merge 3.5 (issue #28704)

This commit is contained in:
Yury Selivanov 2016-11-15 15:27:23 -05:00
commit 21bb0e6f55
3 changed files with 21 additions and 0 deletions

View File

@ -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 @@ class _UnixSelectorEventLoop(selector_events.BaseSelectorEventLoop):
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.

View File

@ -4,6 +4,7 @@ import collections
import errno
import io
import os
import pathlib
import signal
import socket
import stat
@ -251,6 +252,15 @@ class SelectorEventLoopUnixSocketTests(test_utils.TestCase):
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)

View File

@ -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
-------------