closes bpo-37405: Make socket.getsockname() always return a tuple for AF_CAN. (GH-14392)

bggardner · benjaminp · commit 954900a3f98a · 2019-09-12T11:02:48.000+01:00
This fixes a regression from 3.5. In recent releases, `getsockname()` in the AF_CAN case has returned a string.
diff --git 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
@@ -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
@@ -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);
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fixed regression bug for socket.getsockname() for non-CAN_ISOTP AF_CAN`
	`2`	`+address family sockets by returning a 1-tuple instead of string.`
Original file line number	Diff line number	Diff line change
`@@ -1563,7 +1563,7 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)`
`1563`	`1563`	`#endif /* CAN_ISOTP */`
`1564`	`1564`	`default:`
`1565`	`1565`	`{`
`1566`		`- return Py_BuildValue("O&", PyUnicode_DecodeFSDefault,`
	`1566`	`+ return Py_BuildValue("(O&)", PyUnicode_DecodeFSDefault,`
`1567`	`1567`	`ifname);`
`1568`	`1568`	`}`
`1569`	`1569`	`}`