summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-04-07 09:18:54 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-04-07 09:18:54 (GMT)
commit1fd03a4a22a9419dcbad70cf32afebfe5ae390cd (patch)
treeee062e1de9d43f607fb9790671d01f20726ff876 /Lib/asyncio
parent4bd652a276c575de476d634da8cc4f95815721e9 (diff)
downloadcpython-1fd03a4a22a9419dcbad70cf32afebfe5ae390cd.zip
cpython-1fd03a4a22a9419dcbad70cf32afebfe5ae390cd.tar.gz
cpython-1fd03a4a22a9419dcbad70cf32afebfe5ae390cd.tar.bz2
Issue #21155: asyncio.EventLoop.create_unix_server() now raises a ValueError if
path and sock are specified at the same time.
Diffstat (limited to 'Lib/asyncio')
-rw-r--r--Lib/asyncio/unix_events.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py
index 2125548..1fbdd31 100644
--- a/Lib/asyncio/unix_events.py
+++ b/Lib/asyncio/unix_events.py
@@ -206,6 +206,10 @@ class _UnixSelectorEventLoop(selector_events.BaseSelectorEventLoop):
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: