-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
restore bluetooth socket constants on Linux #15209
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.
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
tungol
wants to merge
2
commits into
python:main
Choose a base branch
from
tungol:socket
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+19
−8
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -519,9 +519,10 @@ if sys.platform != "win32": | |||||
|
|
||||||
| __all__ += ["SO_BINDTODEVICE"] | ||||||
|
|
||||||
| if sys.platform != "darwin" and sys.platform != "linux": | ||||||
| if sys.platform != "darwin": | ||||||
| from _socket import BDADDR_ANY as BDADDR_ANY, BDADDR_LOCAL as BDADDR_LOCAL, BTPROTO_RFCOMM as BTPROTO_RFCOMM | ||||||
|
|
||||||
| if sys.platform != "darwin" and sys.platform != "linux": | ||||||
| __all__ += ["BDADDR_ANY", "BDADDR_LOCAL", "BTPROTO_RFCOMM"] | ||||||
|
|
||||||
| if sys.platform == "darwin" and sys.version_info >= (3, 10): | ||||||
|
|
@@ -969,9 +970,10 @@ if sys.platform != "linux": | |||||
| if sys.platform != "darwin" and sys.platform != "linux": | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| __all__ += ["AF_BLUETOOTH"] | ||||||
|
|
||||||
| if sys.platform != "win32" and sys.platform != "darwin" and sys.platform != "linux": | ||||||
| if sys.platform != "win32" and sys.platform != "darwin": | ||||||
| from _socket import BTPROTO_HCI as BTPROTO_HCI, BTPROTO_L2CAP as BTPROTO_L2CAP, BTPROTO_SCO as BTPROTO_SCO | ||||||
|
|
||||||
| if sys.platform != "win32" and sys.platform != "darwin" and sys.platform != "linux": | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Same here. |
||||||
| __all__ += ["BTPROTO_HCI", "BTPROTO_L2CAP", "BTPROTO_SCO"] | ||||||
|
|
||||||
| if sys.platform != "win32" and sys.platform != "darwin" and sys.platform != "linux": | ||||||
|
|
@@ -1131,7 +1133,7 @@ class AddressFamily(IntEnum): | |||||
| AF_QIPCRTR = 42 | ||||||
| if sys.platform != "linux": | ||||||
| AF_LINK = 33 | ||||||
| if sys.platform != "darwin" and sys.platform != "linux": | ||||||
| if sys.platform != "darwin": | ||||||
| AF_BLUETOOTH = 32 | ||||||
| if sys.platform == "win32" and sys.version_info >= (3, 12): | ||||||
| AF_HYPERV = 34 | ||||||
|
|
@@ -1186,7 +1188,7 @@ if sys.platform == "linux": | |||||
|
|
||||||
| if sys.platform != "linux": | ||||||
| AF_LINK: Final = AddressFamily.AF_LINK | ||||||
| if sys.platform != "darwin" and sys.platform != "linux": | ||||||
| if sys.platform != "darwin": | ||||||
| AF_BLUETOOTH: Final = AddressFamily.AF_BLUETOOTH | ||||||
| if sys.platform == "win32" and sys.version_info >= (3, 12): | ||||||
| AF_HYPERV: Final = AddressFamily.AF_HYPERV | ||||||
|
|
||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is Linux excluded from
__all__?They are there at runtime:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
They're not present in the github actions runners. If we add them to
__all__, then we need to addsocket.__all__to the stubtest allowlist. We'd rather not do that, because that would hide any problems with__all__, not just the bluetooth-related ones.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can see what I mean here: https://github.com/python/typeshed/actions/runs/20648303553/job/59289007679
if they're in
__all__, then stubtest errors with something like:The stubtest allowlist mechanism is pretty blunt. We lack a technical means to allowlist only these specific members of
__all__, so puttingsocket.__all__on the allowlist would make it too easy for other problems with__all__to go unnoticed.