Skip to content

[3.12] gh-126742: Add _PyErr_SetLocaleString, use it for gdbm & dlerror messages (GH-126746) #128027

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
Merged
merged 2 commits into from
Dec 17, 2024
Merged

[3.12] gh-126742: Add _PyErr_SetLocaleString, use it for gdbm & dlerror messages (GH-126746) #128027

merged 2 commits into from
Dec 17, 2024

Conversation

picnixz
Copy link
Member

@picnixz picnixz commented Dec 17, 2024

  • Add a helper to set an error from locale-encoded char*
  • Use the helper for gdbm & dlerror messages
    (cherry picked from commit 7303f06)

Co-authored-by: Bénédikt Tran 10796600+picnixz@users.noreply.github.com
Co-authored-by: Victor Stinner vstinner@python.org

picnixz and others added 2 commits December 17, 2024 12:59
@picnixz @vstinner
pythongh-126742: Add _PyErr_SetLocaleString, use it for gdbm & dlerro…
edd033a 
…r messages (pythonGH-126746)

- Add a helper to set an error from locale-encoded `char*`
- Use the helper for gdbm & dlerror messages

Co-authored-by: Victor Stinner <vstinner@python.org>
@picnixz
fix compilation
9df7cb3
@bedevere-app bedevere-app bot mentioned this pull request Dec 17, 2024
Closed
@bedevere-app bedevere-app bot mentioned this pull request Dec 17, 2024
Merged
serhiy-storchaka
serhiy-storchaka approved these changes Dec 17, 2024
View reviewed changes
Copy link
Member

@serhiy-storchaka serhiy-storchaka left a comment

Choose a reason for hiding this comment

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

Were there other conflicts besides a tab character?

@picnixz
Copy link
Member Author

picnixz commented Dec 17, 2024

Were there other conflicts besides a tab character?

There were two conflicts:

  • One in the test_dbm where test_clear() was not present in the 3.12 branch.
  • One in pycore_pyerrors.h where _PyErr_Format had PyObject* instead of PyObject *.

@serhiy-storchaka serhiy-storchaka merged commit e0b61ff into python:3.12 Dec 17, 2024
31 checks passed
@picnixz picnixz deleted the bp-localization-7303f06846b69016a075bca7ad7c6055f29ad024-312 branch December 17, 2024 12:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

@berkerpeksag berkerpeksag Awaiting requested review from berkerpeksag berkerpeksag is a code owner

@erlend-aasland erlend-aasland Awaiting requested review from erlend-aasland erlend-aasland is a code owner

Assignees
No one assigned
Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@picnixz @serhiy-storchaka