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
8315f967
Commit
8315f967
authored
Apr 01, 2012
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Plain Diff
Issue #13872: socket.detach() now marks the socket closed (as mirrored in the socket repr()).
Patch by Matt Joiner.
parents
8612b4c2
70deb3de
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
Lib/socket.py
Lib/socket.py
+11
-0
Lib/test/test_socket.py
Lib/test/test_socket.py
+1
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/socket.py
View file @
8315f967
...
@@ -199,6 +199,17 @@ class socket(_socket.socket):
...
@@ -199,6 +199,17 @@ class socket(_socket.socket):
if
self
.
_io_refs
<=
0
:
if
self
.
_io_refs
<=
0
:
self
.
_real_close
()
self
.
_real_close
()
def
detach
(
self
):
"""detach() -> file descriptor
Close the socket object without closing the underlying file descriptor.
The object cannot be used after this call, but the file descriptor
can be reused for other purposes. The file descriptor is returned.
"""
self
.
_closed
=
True
return
super
().
detach
()
def
fromfd
(
fd
,
family
,
type
,
proto
=
0
):
def
fromfd
(
fd
,
family
,
type
,
proto
=
0
):
""" fromfd(fd, family, type[, proto]) -> socket object
""" fromfd(fd, family, type[, proto]) -> socket object
...
...
Lib/test/test_socket.py
View file @
8315f967
...
@@ -1574,6 +1574,7 @@ class BasicTCPTest(SocketConnectedTest):
...
@@ -1574,6 +1574,7 @@ class BasicTCPTest(SocketConnectedTest):
f
=
self
.
cli_conn
.
detach
()
f
=
self
.
cli_conn
.
detach
()
self
.
assertEqual
(
f
,
fileno
)
self
.
assertEqual
(
f
,
fileno
)
# cli_conn cannot be used anymore...
# cli_conn cannot be used anymore...
self
.
assertTrue
(
self
.
cli_conn
.
_closed
)
self
.
assertRaises
(
socket
.
error
,
self
.
cli_conn
.
recv
,
1024
)
self
.
assertRaises
(
socket
.
error
,
self
.
cli_conn
.
recv
,
1024
)
self
.
cli_conn
.
close
()
self
.
cli_conn
.
close
()
# ...but we can create another socket using the (still open)
# ...but we can create another socket using the (still open)
...
...
Misc/NEWS
View file @
8315f967
...
@@ -37,6 +37,9 @@ Core and Builtins
...
@@ -37,6 +37,9 @@ Core and Builtins
Library
Library
-------
-------
-
Issue
#
13872
:
socket
.
detach
()
now
marks
the
socket
closed
(
as
mirrored
in
the
socket
repr
()).
Patch
by
Matt
Joiner
.
-
Issue
#
14406
:
Fix
a
race
condition
when
using
``
concurrent
.
futures
.
wait
(
-
Issue
#
14406
:
Fix
a
race
condition
when
using
``
concurrent
.
futures
.
wait
(
return_when
=
ALL_COMPLETED
)``.
Patch
by
Matt
Joiner
.
return_when
=
ALL_COMPLETED
)``.
Patch
by
Matt
Joiner
.
...
...
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