Skip to content

gh-127544: Ensure that AF_DECnet is part of socket.AddressFamily, when available #127548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

gh-127544: Ensure that AF_DECnet is part of socket.AddressFamily, when available #127548

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ee4877
Ensure that AF_DECnet is part of the socket.AddressFamily enum, when …
tungol Dec 3, 2024
9adbccb
don't link socket.AddressFamily, I guess
tungol Dec 3, 2024
5f10bb8
too many backticks
tungol Dec 3, 2024
8506452
Merge branch 'main' into AF_DECnet
tungol Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
IntEnum._convert_(
'AddressFamily',
__name__,
lambda C: C.isupper() and C.startswith('AF_'))
lambda C: C.startswith('AF_'))

IntEnum._convert_(
'SocketKind',
Expand Down
6 changes: 5 additions & 1 deletion Lib/test/test_socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2093,11 +2093,15 @@ def test_addressfamily_enum(self):
import _socket, enum
CheckedAddressFamily = enum._old_convert_(
enum.IntEnum, 'AddressFamily', 'socket',
lambda C: C.isupper() and C.startswith('AF_'),
lambda C: C.startswith('AF_'),
source=_socket,
)
enum._test_simple_enum(CheckedAddressFamily, socket.AddressFamily)

@unittest.skipUnless(hasattr(_socket, 'AF_DECnet'), 'AF_DECnet required.')
def test_addressfamily_enum_decnet(self):
assert hasattr(socket.AddressFamily, 'AF_DECnet')

def test_socketkind_enum(self):
import _socket, enum
CheckedSocketKind = enum._old_convert_(
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2024-12-02-21-19-53.gh-issue-127544.N7uEsX.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Ensure that ```AF_DECnet``` is part of the :class:`!socket.AddressFamily`
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why :class:`socket.AddressFamily` didn't work.

enum, when available.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Ensure that ```AF_DECnet``` is part of the :class:`!socket.AddressFamily`
enum, when available.
Ensure that ``AF_DECnet`` is part of the :class:`!socket.AddressFamily`
enum.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why remove "when available"? It's in an ifdef in socketmodule.c, so CPython already hedges that it might not be present on any given system.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's a bit redundant, and when it's available, it'll appear in AddressFamily, otherwise it won't. If it isn't modified, it seems that it must be in AddressFamily, rather than changing with the os environment.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's the opposite of how I'd read it. "when available" at the end meaning "when it's available in the OS environment, ensure that it's part of AddressFamily". Without that, I'd think that "ensure that it's in AddressFamily" means that we always ensure it's in AddressFamily, whether or not it's available from the OS, or that we think it's universally available so not worth mentioning that part.

Loading