[Python-checkins] closes bpo-37405: Make socket.getsockname() always return a tuple for AF_CAN. (GH-14392)
Benjamin Peterson
webhook-mailer at python.org
Thu Sep 12 06:02:53 EDT 2019
https://github.com/python/cpython/commit/954900a3f98a8c0dea14dd575490237f3f8626b3
commit: 954900a3f98a8c0dea14dd575490237f3f8626b3
branch: master
author: bggardner <brent at ebrent.net>
committer: Benjamin Peterson <benjamin at python.org>
date: 2019-09-12T11:02:48+01:00
summary:
closes bpo-37405: Make socket.getsockname() always return a tuple for AF_CAN. (GH-14392)
This fixes a regression from 3.5. In recent releases, `getsockname()` in the AF_CAN case has returned a string.
files:
A Misc/NEWS.d/next/Library/2019-09-11-20-27-41.bpo-37405.MG5xiY.rst
M Lib/test/test_socket.py
M Modules/socketmodule.c
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index b855c523f080..b74549024b78 100755
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1948,7 +1948,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
diff --git a/Misc/NEWS.d/next/Library/2019-09-11-20-27-41.bpo-37405.MG5xiY.rst b/Misc/NEWS.d/next/Library/2019-09-11-20-27-41.bpo-37405.MG5xiY.rst
new file mode 100644
index 000000000000..09e109734221
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-09-11-20-27-41.bpo-37405.MG5xiY.rst
@@ -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.
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 3548b0c87875..c649fa3c982f 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1563,7 +1563,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);
}
}
More information about the Python-checkins
mailing list