summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorbggardner <brent@ebrent.net>2019-09-12 10:02:48 (GMT)
committerBenjamin Peterson <benjamin@python.org>2019-09-12 10:02:48 (GMT)
commit954900a3f98a8c0dea14dd575490237f3f8626b3 (patch)
tree20376e6ee25b3d01c27e6294ddedb87ff050a03e /Modules
parent64535fc6c0712caef0bc46be30e661f7ccf8280e (diff)
downloadcpython-954900a3f98a8c0dea14dd575490237f3f8626b3.zip
cpython-954900a3f98a8c0dea14dd575490237f3f8626b3.tar.gz
cpython-954900a3f98a8c0dea14dd575490237f3f8626b3.tar.bz2
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.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/socketmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 3548b0c..c649fa3 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);
}
}