[Python-checkins] cpython (3.4): Issue #21155: asyncio.EventLoop.create_unix_server() now raises a ValueError if
victor.stinner
python-checkins at python.org
Mon Apr 7 11:22:31 CEST 2014
http://hg.python.org/cpython/rev/a6b764848b20
changeset: 90164:a6b764848b20
branch: 3.4
user: Victor Stinner <victor.stinner at gmail.com>
date: Mon Apr 07 11:18:54 2014 +0200
summary:
Issue #21155: asyncio.EventLoop.create_unix_server() now raises a ValueError if
path and sock are specified at the same time.
files:
Lib/asyncio/unix_events.py | 4 ++++
Lib/test/test_asyncio/test_events.py | 11 +++++++++++
Misc/NEWS | 3 +++
3 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
@@ -206,6 +206,10 @@
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 --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -703,6 +703,17 @@
# 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
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,9 @@
Library
-------
+- Issue #21155: asyncio.EventLoop.create_unix_server() now raises a ValueError
+ if path and sock are specified at the same time.
+
- Issue #21149: Improved thread-safety in logging cleanup during interpreter
shutdown. Thanks to Devin Jeanpierre for the patch.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list