[Python-checkins] cpython (merge 3.6 -> default): Merge 3.6 (issue #28704)

[yury.selivanov]

https://hg.python.org/cpython/rev/c7d2ec49a80b
changeset:   105136:c7d2ec49a80b
parent:      105133:298c53e2461f
parent:      105135:0d663f758adb
user:        Yury Selivanov <yury at magic.io>
date:        Tue Nov 15 15:27:48 2016 -0500
summary:
  Merge 3.6 (issue #28704)

files:
  Lib/asyncio/unix_events.py                |   8 ++++++++
  Lib/test/test_asyncio/test_unix_events.py |  10 ++++++++++
  2 files changed, 18 insertions(+), 0 deletions(-)


diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py
--- a/Lib/asyncio/unix_events.py
+++ b/Lib/asyncio/unix_events.py
@@ -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 --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py
--- 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 @@
             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)

-- 
Repository URL: https://hg.python.org/cpython