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
56065d4c
Commit
56065d4c
authored
Apr 09, 2019
by
Quentin Dawans
Committed by
Miss Islington (bot)
Apr 09, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-34139: Remove unix datagram socket from FS before binding (GH-8323)
https://bugs.python.org/issue34139
parent
5aaac94e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
0 deletions
+29
-0
Lib/asyncio/base_events.py
Lib/asyncio/base_events.py
+14
-0
Lib/test/test_asyncio/test_base_events.py
Lib/test/test_asyncio/test_base_events.py
+14
-0
Misc/NEWS.d/next/Library/2018-07-18-11-25-34.bpo-34139.tKbmW7.rst
...S.d/next/Library/2018-07-18-11-25-34.bpo-34139.tKbmW7.rst
+1
-0
No files found.
Lib/asyncio/base_events.py
View file @
56065d4c
...
...
@@ -20,6 +20,7 @@ import heapq
import
itertools
import
os
import
socket
import
stat
import
subprocess
import
threading
import
time
...
...
@@ -1183,6 +1184,19 @@ class BaseEventLoop(events.AbstractEventLoop):
for
addr
in
(
local_addr
,
remote_addr
):
if
addr
is
not
None
and
not
isinstance
(
addr
,
str
):
raise
TypeError
(
'string is expected'
)
if
local_addr
and
local_addr
[
0
]
not
in
(
0
,
'
\
x00
'
):
try
:
if
stat
.
S_ISSOCK
(
os
.
stat
(
local_addr
).
st_mode
):
os
.
remove
(
local_addr
)
except
FileNotFoundError
:
pass
except
OSError
as
err
:
# Directory may have permissions only to create socket.
logger
.
error
(
'Unable to check or remove stale UNIX '
'socket %r: %r'
,
local_addr
,
err
)
addr_pairs_info
=
(((
family
,
proto
),
(
local_addr
,
remote_addr
)),
)
else
:
...
...
Lib/test/test_asyncio/test_base_events.py
View file @
56065d4c
...
...
@@ -1662,6 +1662,20 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase):
self
.
loop
.
run_until_complete
(
protocol
.
done
)
self
.
assertEqual
(
'CLOSED'
,
protocol
.
state
)
@
unittest
.
skipUnless
(
hasattr
(
socket
,
'AF_UNIX'
),
'No UNIX Sockets'
)
def
test_create_datagram_endpoint_existing_sock_unix
(
self
):
with
test_utils
.
unix_socket_path
()
as
path
:
sock
=
socket
.
socket
(
socket
.
AF_UNIX
,
type
=
socket
.
SOCK_DGRAM
)
sock
.
bind
(
path
)
sock
.
close
()
coro
=
self
.
loop
.
create_datagram_endpoint
(
lambda
:
MyDatagramProto
(
create_future
=
True
,
loop
=
self
.
loop
),
path
,
family
=
socket
.
AF_UNIX
)
transport
,
protocol
=
self
.
loop
.
run_until_complete
(
coro
)
transport
.
close
()
self
.
loop
.
run_until_complete
(
protocol
.
done
)
def
test_create_datagram_endpoint_sock_sockopts
(
self
):
class
FakeSock
:
type
=
socket
.
SOCK_DGRAM
...
...
Misc/NEWS.d/next/Library/2018-07-18-11-25-34.bpo-34139.tKbmW7.rst
0 → 100644
View file @
56065d4c
Remove stale unix datagram socket before binding
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