diff -r f9a73831f9e7 Lib/asyncio/unix_events.py --- a/Lib/asyncio/unix_events.py Fri Apr 04 17:17:36 2014 +0200 +++ b/Lib/asyncio/unix_events.py Fri Apr 04 18:56:05 2014 +0200 @@ -206,6 +206,10 @@ class _UnixSelectorEventLoop(selector_ev raise TypeError('ssl argument must be an SSLContext or None') if path is not None: + if sock is not None: + raise ValueError( + 'path and sock can not be specified at the same time') + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) try: diff -r f9a73831f9e7 Lib/test/test_asyncio/test_events.py --- a/Lib/test/test_asyncio/test_events.py Fri Apr 04 17:17:36 2014 +0200 +++ b/Lib/test/test_asyncio/test_events.py Fri Apr 04 18:56:05 2014 +0200 @@ -703,6 +703,17 @@ class EventLoopTestsMixin: # close server server.close() + @unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'No UNIX Sockets') + def test_create_unix_server_path_socket_error(self): + proto = MyProto(loop=self.loop) + sock = socket.socket() + with sock: + f = self.loop.create_unix_server(lambda: proto, '/test', sock=sock) + with self.assertRaisesRegex(ValueError, + 'path and sock can not be specified ' + 'at the same time'): + server = self.loop.run_until_complete(f) + def _create_ssl_context(self, certfile, keyfile=None): sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23) sslcontext.options |= ssl.OP_NO_SSLv2