Skip to content

Commit

Permalink
Fix create_unix_server to support Path-like objects (PEP 519)
Browse files Browse the repository at this point in the history
  • Loading branch information
1st1 committed Nov 15, 2016
1 parent 7e9a4d5 commit fff05d4
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
8 changes: 8 additions & 0 deletions asyncio/unix_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
10 changes: 10 additions & 0 deletions tests/test_unix_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import errno
import io
import os
import pathlib
import signal
import socket
import stat
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit fff05d4

Please sign in to comment.