Skip to content

gh-129719: Restore missing socket.CAN_RAW_ERR_FILTER on Linux #129721

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

Merged
merged 7 commits into from
Apr 18, 2025

Conversation

jbogers
Copy link
Contributor

@jbogers jbogers commented Feb 6, 2025

Restore socket.CAN_RAW_ERR_FILTER on Linux by looking at the HAVE_LINUX_CAN_RAW_H flag, as the linux/can/raw.h file defines this value in an enum and not a normal define.

As linux/can/raw.h should always contain the value, I believe this change is safe to make.


📚 Documentation preview 📚: https://cpython-previews--129721.org.readthedocs.build/

@ghost
Copy link

ghost commented Feb 6, 2025

All commit authors signed the Contributor License Agreement.
CLA signed

@bedevere-app

This comment was marked as resolved.

@bedevere-app

This comment was marked as resolved.

@jbogers jbogers force-pushed the fix_can_raw_err_filter_in_socket_module branch from c200548 to b20c686 Compare February 6, 2025 10:59
@bedevere-app

This comment was marked as resolved.

1 similar comment
@bedevere-app

This comment was marked as resolved.

@jbogers jbogers force-pushed the fix_can_raw_err_filter_in_socket_module branch from 2c5617a to bde35e3 Compare February 6, 2025 11:15
@bedevere-app

This comment was marked as resolved.

Copy link
Member

@ZeroIntensity ZeroIntensity left a comment

Choose a reason for hiding this comment

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

In the future, please don't force push; it just makes reviewing more difficult, and we squash merge at the end anyway.

Regarding the actual change: do we want to backport this? (Not to 3.11, but we could to 3.12+)

cc @erlend-aasland who added it originally, and @serhiy-storchaka who merged the offending PR (GH-30066).

Co-authored-by: Peter Bierma <[email protected]>
Copy link
Member

@ZeroIntensity ZeroIntensity left a comment

Choose a reason for hiding this comment

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

I think this is trivial enough that we don't need a test. LGTM.

@jbogers
Copy link
Contributor Author

jbogers commented Apr 2, 2025

I think this is trivial enough that we don't need a test. LGTM.

There has been no activity on this PR for a while. Is there an action I (as PR creator) have to take to move this forward? Or do I just have to wait? Either is fine with me, but I'm unfamiliar with the process and I want to be sure I'm not the one holding this up now.

@sobolevn sobolevn added the needs backport to 3.13 bugs and security fixes label Apr 18, 2025
@sobolevn
Copy link
Member

Thank you, indeed the check is about

if test "x$ac_cv_header_linux_can_raw_h" = xyes
then :
  printf "%s\n" "#define HAVE_LINUX_CAN_RAW_H 1" >>confdefs.h

fi

@sobolevn sobolevn merged commit ce31ae5 into python:main Apr 18, 2025
52 checks passed
@miss-islington-app
Copy link

Thanks @jbogers for the PR, and @sobolevn for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Apr 18, 2025
…pythonGH-129721)

(cherry picked from commit ce31ae5)

Co-authored-by: Jeroen Bogers <[email protected]>
Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
Co-authored-by: Peter Bierma <[email protected]>
@bedevere-app
Copy link

bedevere-app bot commented Apr 18, 2025

GH-132702 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Apr 18, 2025
sobolevn pushed a commit that referenced this pull request Apr 18, 2025
GH-129721) (#132702)

gh-129719: Restore missing `socket.CAN_RAW_ERR_FILTER` on Linux (GH-129721)
(cherry picked from commit ce31ae5)

Co-authored-by: Jeroen Bogers <[email protected]>
Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
Co-authored-by: Peter Bierma <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants