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

Jump to bottom

Suppress socket imports that might not exist on some systems #2916

Merged
merged 6 commits into from
Jan 21, 2024
Merged

Suppress socket imports that might not exist on some systems #2916

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
71e7154
Suppress socket imports that might not exist on some systems
CoolCat467 Jan 2, 2024
08edb9d
Merge branch 'master' into suppress-socket-import-errors
CoolCat467 Jan 9, 2024
ea132d8
Merge branch 'master' into suppress-socket-import-errors
CoolCat467 Jan 10, 2024
a435dd1
Only suppress `if_nameindex` import and add better comment for the fu…
CoolCat467 Jan 10, 2024
9dda073
Reword comment
CoolCat467 Jan 11, 2024
6d035ef
Merge branch 'master' into suppress-socket-import-errors
CoolCat467 Jan 19, 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
9 changes: 8 additions & 1 deletion src/trio/socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,17 @@
if sys.implementation.name == "cpython":
from socket import (
if_indextoname as if_indextoname,
if_nameindex as if_nameindex,
if_nametoindex as if_nametoindex,
)

# In https://github.com/kivy/python-for-android, if_nameindex
Copy link
Contributor

@A5rocks A5rocks Jan 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

For what it's worth: as far as I can tell, this is just a CPython thing. Though that's a guess based on how CPython is pulling it in (see https://bugs.python.org/msg279495). I kinda assume this is just building CPython for Android, no specific changes.

Copy link
Member Author

Choose a reason for hiding this comment

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

I think 9dda073 should be sufficient

# was introduced in API 24, so it doesn't exist for any version
# prior.
with _suppress(ImportError):
from socket import (
if_nameindex as if_nameindex,
CoolCat467 marked this conversation as resolved.
Show resolved Hide resolved
)


# not always available so expose only if
if sys.platform != "win32" or not _t.TYPE_CHECKING:
Expand Down