Skip to content

Conversation

@picnixz
Copy link
Member

  • 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 [email protected]
Co-authored-by: Victor Stinner [email protected]

picnixzand others added 2 commits December 17, 2024 12:59
…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 <[email protected]>
Copy link
Member

@serhiy-storchakaserhiy-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
MemberAuthor

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-storchakaserhiy-storchaka merged commit e0b61ff into python:3.12Dec 17, 2024
26 checks passed
@picnixzpicnixz deleted the bp-localization-7303f06846b69016a075bca7ad7c6055f29ad024-312 branch December 17, 2024 12:56
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@picnixz@serhiy-storchaka