diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-04-07 09:20:22 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-04-07 09:20:22 (GMT) |
| commit | 7b2262fe78b3dff8c986d0bfe942a4defbd973f0 (patch) | |
| tree | 9b74480e634bb9a172638e286cb973059a38edb5 /Lib/asyncio/unix_events.py | |
| parent | 1b5643fcb47dfc471613ed37cd38556c692fe566 (diff) | |
| parent | 1fd03a4a22a9419dcbad70cf32afebfe5ae390cd (diff) | |
| download | cpython-7b2262fe78b3dff8c986d0bfe942a4defbd973f0.zip cpython-7b2262fe78b3dff8c986d0bfe942a4defbd973f0.tar.gz cpython-7b2262fe78b3dff8c986d0bfe942a4defbd973f0.tar.bz2 | |
(Merge 3.4) Issue #21155: asyncio.EventLoop.create_unix_server() now raises a
ValueError if path and sock are specified at the same time. asyncio: Document
Task.cancel() properly.
Diffstat (limited to 'Lib/asyncio/unix_events.py')
| -rw-r--r-- | Lib/asyncio/unix_events.py | 4 |
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: |