From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Thu, 12 Sep 2019 10:34:28 +0000 (-0700) Subject: closes bpo-37405: Make socket.getsockname() always return a tuple for AF_CAN. (GH... X-Git-Tag: v3.8.0rc1~149 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f60fd95dcc189ace8c0a2177a394b9cc20389a1e;p=python closes bpo-37405: Make socket.getsockname() always return a tuple for AF_CAN. (GH-14392) (GH-16018) This fixes a regression from 3.5. In recent releases, `getsockname()` in the AF_CAN case has returned a string. (cherry picked from commit 954900a3f98a8c0dea14dd575490237f3f8626b3) Co-authored-by: bggardner --- diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index c472be135e..1bf562a03d 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1897,7 +1897,9 @@ class BasicCANTest(unittest.TestCase): 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 0000000000..09e1097342 --- /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 910e2bdd13..594a0d6efa 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -1524,7 +1524,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); } }