From 0403dc8d1d51c3e76cff54af36e79fe4f686e8c4 Mon Sep 17 00:00:00 2001 From: Kevin Kirsche Date: Thu, 18 Aug 2022 09:26:20 -0400 Subject: [PATCH 1/4] fix: add missing re-exports of linux socket constants fix: 7077 --- stdlib/socket.pyi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/stdlib/socket.pyi b/stdlib/socket.pyi index a0f5708bf806..e681011159f4 100644 --- a/stdlib/socket.pyi +++ b/stdlib/socket.pyi @@ -262,6 +262,7 @@ if sys.platform == "darwin" and sys.version_info >= (3, 10): if sys.platform == "linux": from _socket import ( + AF_NETLINK as AF_NETLINK, ALG_OP_DECRYPT as ALG_OP_DECRYPT, ALG_OP_ENCRYPT as ALG_OP_ENCRYPT, ALG_OP_SIGN as ALG_OP_SIGN, @@ -297,6 +298,20 @@ if sys.platform == "linux": CAN_RAW_RECV_OWN_MSGS as CAN_RAW_RECV_OWN_MSGS, CAN_RTR_FLAG as CAN_RTR_FLAG, CAN_SFF_MASK as CAN_SFF_MASK, + NETLINK_ARPD as NETLINK_ARPD, + NETLINK_CRYPT as NETLINK_CRYPT, + NETLINK_DNRTMSG as NETLINK_DNRTMSG, + NETLINK_FIREWALL as NETLINK_FIREWALL, + NETLINK_IP6_FW as NETLINK_IP6_FW, + NETLINK_NFLOG as NETLINK_NFLOG, + NETLINK_ROUTE6 as NETLINK_ROUTE6, + NETLINK_ROUTE as NETLINK_ROUTE, + NETLINK_SKIP as NETLINK_SKIP, + NETLINK_TAPBASE as NETLINK_TAPBASE, + NETLINK_TCPDIAG as NETLINK_TCPDIAG, + NETLINK_USERSOCK as NETLINK_USERSOCK, + NETLINK_W1 as NETLINK_W1, + NETLINK_XFRM as NETLINK_XFRM, PACKET_BROADCAST as PACKET_BROADCAST, PACKET_FASTROUTE as PACKET_FASTROUTE, PACKET_HOST as PACKET_HOST, From 91a4f026796af78680c515999186cfd79d33e4d3 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 18 Aug 2022 13:28:41 +0000 Subject: [PATCH 2/4] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stdlib/socket.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/socket.pyi b/stdlib/socket.pyi index e681011159f4..854cf5b331e1 100644 --- a/stdlib/socket.pyi +++ b/stdlib/socket.pyi @@ -304,8 +304,8 @@ if sys.platform == "linux": NETLINK_FIREWALL as NETLINK_FIREWALL, NETLINK_IP6_FW as NETLINK_IP6_FW, NETLINK_NFLOG as NETLINK_NFLOG, - NETLINK_ROUTE6 as NETLINK_ROUTE6, NETLINK_ROUTE as NETLINK_ROUTE, + NETLINK_ROUTE6 as NETLINK_ROUTE6, NETLINK_SKIP as NETLINK_SKIP, NETLINK_TAPBASE as NETLINK_TAPBASE, NETLINK_TCPDIAG as NETLINK_TCPDIAG, From 77ba35e423bbcc955257a00e589ab4408f843496 Mon Sep 17 00:00:00 2001 From: Kevin Kirsche Date: Thu, 18 Aug 2022 09:32:16 -0400 Subject: [PATCH 3/4] fix: remove non-existant at runtime items --- stdlib/socket.pyi | 2 -- 1 file changed, 2 deletions(-) diff --git a/stdlib/socket.pyi b/stdlib/socket.pyi index 854cf5b331e1..170ad32cccad 100644 --- a/stdlib/socket.pyi +++ b/stdlib/socket.pyi @@ -262,7 +262,6 @@ if sys.platform == "darwin" and sys.version_info >= (3, 10): if sys.platform == "linux": from _socket import ( - AF_NETLINK as AF_NETLINK, ALG_OP_DECRYPT as ALG_OP_DECRYPT, ALG_OP_ENCRYPT as ALG_OP_ENCRYPT, ALG_OP_SIGN as ALG_OP_SIGN, @@ -299,7 +298,6 @@ if sys.platform == "linux": CAN_RTR_FLAG as CAN_RTR_FLAG, CAN_SFF_MASK as CAN_SFF_MASK, NETLINK_ARPD as NETLINK_ARPD, - NETLINK_CRYPT as NETLINK_CRYPT, NETLINK_DNRTMSG as NETLINK_DNRTMSG, NETLINK_FIREWALL as NETLINK_FIREWALL, NETLINK_IP6_FW as NETLINK_IP6_FW, From ac3d3cabb4dae9758325b98e0f687675d8b0495a Mon Sep 17 00:00:00 2001 From: Kevin Kirsche Date: Thu, 18 Aug 2022 14:49:11 -0400 Subject: [PATCH 4/4] fix: NETLINK_CRYPTO --- stdlib/socket.pyi | 1 + 1 file changed, 1 insertion(+) diff --git a/stdlib/socket.pyi b/stdlib/socket.pyi index 170ad32cccad..89a6d059f165 100644 --- a/stdlib/socket.pyi +++ b/stdlib/socket.pyi @@ -298,6 +298,7 @@ if sys.platform == "linux": CAN_RTR_FLAG as CAN_RTR_FLAG, CAN_SFF_MASK as CAN_SFF_MASK, NETLINK_ARPD as NETLINK_ARPD, + NETLINK_CRYPTO as NETLINK_CRYPTO, NETLINK_DNRTMSG as NETLINK_DNRTMSG, NETLINK_FIREWALL as NETLINK_FIREWALL, NETLINK_IP6_FW as NETLINK_IP6_FW,