Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
1fd03a4a
Commit
1fd03a4a
authored
Apr 07, 2014
by
Victor Stinner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #21155: asyncio.EventLoop.create_unix_server() now raises a ValueError if
path and sock are specified at the same time.
parent
4bd652a2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
0 deletions
+18
-0
Lib/asyncio/unix_events.py
Lib/asyncio/unix_events.py
+4
-0
Lib/test/test_asyncio/test_events.py
Lib/test/test_asyncio/test_events.py
+11
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/asyncio/unix_events.py
View file @
1fd03a4a
...
...
@@ -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
:
...
...
Lib/test/test_asyncio/test_events.py
View file @
1fd03a4a
...
...
@@ -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
...
...
Misc/NEWS
View file @
1fd03a4a
...
...
@@ -27,6 +27,9 @@ Core and Builtins
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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment