Skip to content

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

Merged
sobolevn merged 7 commits into
python:mainfrom
jbogers:fix_can_raw_err_filter_in_socket_module
Apr 18, 2025
Merged

gh-129719: Restore missing socket.CAN_RAW_ERR_FILTER on Linux#129721
sobolevn merged 7 commits into
python:mainfrom
jbogers:fix_can_raw_err_filter_in_socket_module

Conversation

@jbogers

@jbogersjbogers commented Feb 6, 2025•
edited by github-actions Bot
Loading

Copy link
Copy Markdown
Contributor

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

ghost commented Feb 6, 2025•
edited by ghost
Loading

Copy link
Copy Markdown

All commit authors signed the Contributor License Agreement.
CLA signed

@bedevere-app

This comment was marked as resolved.

Sign in to view
@bedevere-appbedevere-appBot mentioned this pull request Feb 6, 2025
Closed
@jbogers
jbogersforce-pushed the fix_can_raw_err_filter_in_socket_module branch from e5dc1c8 to c200548CompareFebruary 6, 2025 10:56
@bedevere-app

This comment was marked as resolved.

Sign in to view
@jbogers
jbogersforce-pushed the fix_can_raw_err_filter_in_socket_module branch from c200548 to b20c686CompareFebruary 6, 2025 10:59
@bedevere-app

This comment was marked as resolved.

Sign in to view
1 similar comment
@bedevere-app

This comment was marked as resolved.

Sign in to view
@jbogers
jbogersforce-pushed the fix_can_raw_err_filter_in_socket_module branch from 2c5617a to bde35e3CompareFebruary 6, 2025 11:15
@bedevere-app

This comment was marked as resolved.

Sign in to view
ZeroIntensity
ZeroIntensity reviewed Feb 6, 2025
View reviewed changes

@ZeroIntensityZeroIntensity left a comment

Copy link
Copy Markdown
Member

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).

Comment threadMisc/NEWS.d/next/Library/2025-02-06-11-23-51.gh-issue-129719.Of6rvb.rst Outdated
Comment threadDoc/library/socket.rst Outdated
Comment threadDoc/whatsnew/3.14.rst Outdated
ZeroIntensity
ZeroIntensity reviewed Feb 6, 2025
View reviewed changes
Comment threadMisc/NEWS.d/next/Library/2025-02-06-11-23-51.gh-issue-129719.Of6rvb.rst Outdated
@jbogers@ZeroIntensity
Fix documentation error.
1739550
Co-authored-by: Peter Bierma <zintensitydev@gmail.com>
ZeroIntensity
ZeroIntensity approved these changes Feb 8, 2025
View reviewed changes

@ZeroIntensityZeroIntensity left a comment

Copy link
Copy Markdown
Member

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

jbogers commented Apr 2, 2025

Copy link
Copy Markdown
ContributorAuthor

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.

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

sobolevn commented Apr 18, 2025

Copy link
Copy Markdown
Member

Thank you, indeed the check is about

iftest"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:mainApr 18, 2025
@miss-islington-app

miss-islington-appBot commented Apr 18, 2025

Copy link
Copy Markdown

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
@jbogers@blurb-it
@ZeroIntensity@miss-islington
pythongh-129719: Restore missingsocket.CAN_RAW_ERR_FILTERon Linux (…
43a0799
…pythonGH-129721)
(cherry picked from commit ce31ae5)
Co-authored-by: Jeroen Bogers <11465689+jbogers@users.noreply.github.com>
Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
Co-authored-by: Peter Bierma <zintensitydev@gmail.com>
@bedevere-app

bedevere-appBot commented Apr 18, 2025

Copy link
Copy Markdown

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

@bedevere-appbedevere-appBot 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
@miss-islington@jbogers
@blurb-it@ZeroIntensity
[3.13]gh-129719: Restore missingsocket.CAN_RAW_ERR_FILTERon Linux (
83cb89b
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 <11465689+jbogers@users.noreply.github.com>
Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
Co-authored-by: Peter Bierma <zintensitydev@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sobolevnsobolevnsobolevn approved these changes
@ZeroIntensityZeroIntensityZeroIntensity approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jbogers@sobolevn@ZeroIntensity