Skip to content
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

_socket.py: fix for systems where AI_NUMERICSERV is not defined #3135

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+5 −1
Open

_socket.py: fix for systems where AI_NUMERICSERV is not defined #3135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cacb3b
newsfragments: add 3133.bugfix.rst
barracuda156 Nov 12, 2024
5260922
_socket.py: fix for systems where AI_NUMERICSERV is not defined
barracuda156 Nov 12, 2024
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: 2 additions & 0 deletions newsfragments/3133.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixed socket module for some older systems which lack `socket.AI_NUMERICSERV`.
Now trio works on legacy (pre-Lion) macOS.
4 changes: 3 additions & 1 deletion src/trio/_socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,9 @@ def set_custom_socket_factory(
# getaddrinfo and friends
################################################################

_NUMERIC_ONLY = _stdlib_socket.AI_NUMERICHOST | _stdlib_socket.AI_NUMERICSERV
# AI_NUMERICSERV may be missing on some older platforms, so use it when available.
_NUMERIC_ONLY = _stdlib_socket.AI_NUMERICHOST
_NUMERIC_ONLY |= getattr(_stdlib_socket, "AI_NUMERICSERV", 0)
Comment on lines +172 to +174
Copy link
Member

Choose a reason for hiding this comment

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

I think you need to be a bit more specific here, otherwise future people that stumble on this comment will have to do a bunch of research to figure out why/when it might be missing. And as I said in the issue, perhaps even a note on why it's needed despite being deprecated since a decade+

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe just linking the issue will work? That has info.

Copy link
Contributor

@A5rocks A5rocks Dec 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

@barracuda156 could you fix this? I think this is the only problem before merging.

(well, barring rejecting this whole change on basis of it being something we cannot test for a system we could not support. IMO this change is fine but @jakkdl didn't respond to the response you left on the issue.)



# It would be possible to @overload the return value depending on Literal[AddressFamily.INET/6], but should probably be added in typeshed first
Expand Down
Loading