From 80e1c43ddf8099d0ebc4735d405942c4c5f6925c Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola' Date: Tue, 21 May 2013 21:02:04 +0200 Subject: [PATCH] Fix issue #17996: expose socket.AF_LINK constant on BSD and OSX. --- Doc/library/socket.rst | 5 +++++ Misc/NEWS | 2 ++ Modules/socketmodule.c | 3 +++ 3 files changed, 10 insertions(+) diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index aa59f7fc439..edd196a89ba 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -293,6 +293,11 @@ The module :mod:`socket` exports the following constants and functions: TIPC related constants, matching the ones exported by the C socket API. See the TIPC documentation for more information. +.. data:: AF_LINK + + Availability: BSD, OSX. + + .. versionadded:: 3.4 .. data:: has_ipv6 diff --git a/Misc/NEWS b/Misc/NEWS index 2027e65f3e8..a025c7073ed 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -99,6 +99,8 @@ Core and Builtins Library ------- +- Issue #17996: socket module now exposes AF_LINK constant on BSD and OSX. + - Issue #17900: Allowed pickling of recursive OrderedDicts. Decreased pickled size and pickling time. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 20db3d94641..fa75a102f24 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -5658,6 +5658,9 @@ PyInit__socket(void) /* Alias to emulate 4.4BSD */ PyModule_AddIntMacro(m, AF_ROUTE); #endif +#ifdef AF_LINK + PyModule_AddIntMacro(m, AF_LINK); +#endif #ifdef AF_ASH /* Ash */ PyModule_AddIntMacro(m, AF_ASH);