Skip to content

bpo-37405: socket.getsockname() returns string instead of tuple #14392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 12, 2019
Merged

bpo-37405: socket.getsockname() returns string instead of tuple #14392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
da56b18
bpo-37405: socket.getsockname() returns string instead of tuple
bggardner Jun 26, 2019
0cd0ac9
Added BasicCANTest.testBind() to check return of getsockname()
bggardner Jun 26, 2019
34e708b
Removed whitespace
bggardner Jun 26, 2019
a538f0d
Remove more whitespace
bggardner Jun 26, 2019
8763f3b
Replaced BasicCANTest.testBind() with additional line in BasicCANTest…
bggardner Jun 27, 2019
cc2c37f
Removed AF_CAN from makesockaddr return tuple
bggardner Jun 28, 2019
de6995f
Update test_socket.py
bggardner Sep 12, 2019
f5937be
Added NEWS.d entry
bggardner Sep 12, 2019
b72196f
remove confusing sentence about second element of a 1-tuple
benjaminp Sep 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Lib/test/test_socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1920,7 +1920,9 @@ def testCreateBCMSocket(self):

def testBindAny(self):
with socket.socket(socket.PF_CAN, socket.SOCK_RAW, socket.CAN_RAW) as s:
s.bind(('', ))
address = ('', )
s.bind(address)
self.assertEqual(s.getsockname(), address)

def testTooLongInterfaceName(self):
# most systems limit IFNAMSIZ to 16, take 1024 to be sure
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2019-09-11-20-27-41.bpo-37405.MG5xiY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixed regression bug for socket.getsockname() for non-CAN_ISOTP AF_CAN
address family sockets by returning a 1-tuple instead of string.
2 changes: 1 addition & 1 deletion Modules/socketmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1513,7 +1513,7 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)
#endif /* CAN_ISOTP */
default:
{
return Py_BuildValue("O&", PyUnicode_DecodeFSDefault,
return Py_BuildValue("(O&)", PyUnicode_DecodeFSDefault,
ifname);
}
}
Expand Down