GeezerVison is showing github.com — Fix `PyUnicode` functions for Python 3.13 by cdce8p · Pull Request #17504 · python/mypy
Conversation
cdce8p
commented
Jul 7, 2024
•
edited
Loading
Uh oh!
There was an error while loading. Please reload this page.
Replace _PyUnicode_EqualToASCIIString with PyUnicode_EqualToUTF8.
https://docs.python.org/dev/c-api/unicode.html#c.PyUnicode_EqualToUTF8
python/cpython#110289
Fixes
/home/runner/work/mypy/mypy/mypyc/lib-rt/getargs.c: In function ‘vgetargskeywords’: (diff)
/home/runner/work/mypy/mypy/mypyc/lib-rt/pythonsupport.h:310:45: error: implicit declaration of function ‘_PyUnicode_EqualToASCIIString’; did you mean ‘CPyUnicode_EqualToASCIIString’? [-Werror=implicit-function-declaration] (diff)
310 | #define CPyUnicode_EqualToASCIIString(x, y) _PyUnicode_EqualToASCIIString(x, y) (diff)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ (diff)
/home/runner/work/mypy/mypy/mypyc/lib-rt/getargs.c:398:21: note: in expansion of macro ‘CPyUnicode_EqualToASCIIString’ (diff)
398 | if (CPyUnicode_EqualToASCIIString(key, kwlist[i])) { (diff)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ (diff)
Sorry, something went wrong.
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.
nit: want to change the comment on L83 of str_ops.c?
I guess we could still use _PyUnicode_FastCopyCharacters, but is maybe not the biggest deal
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
nit: want to change the comment on L83 of str_ops.c?
Done!
I guess we could still use _PyUnicode_FastCopyCharacters, but is maybe not the biggest deal
Yeah, technically _PyUnicode_FastCopyCharacters was only moved to internal/pycore_unicodeobject.h which we still include for _PyUnicode_EQ (see #17506). However, moving to the public PyUnicode_CopyCharacters might be the better call here (even if slightly slower if at all).
https://github.com/python/cpython/blob/v3.13.0b3/Include/internal/pycore_unicodeobject.h#L56
|
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
I guess we could still use _PyUnicode_FastCopyCharacters, but is maybe not the biggest deal
Yeah, technically _PyUnicode_FastCopyCharacters was only moved to internal/pycore_unicodeobject.h which we still include for _PyUnicode_EQ (see #17506). However, moving to the public PyUnicode_CopyCharacters might be the better call here (even if slightly slower if at all). https://github.com/python/cpython/blob/v3.13.0b3/Include/internal/pycore_unicodeobject.h#L56
Scratch that. Let's just continue using _PyUnicode_FastCopyCharacters here. It's also used in _PyUnicode_JoinArray which this functions is adapted from.
|
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Assignees
No one assigned
Milestone
No milestone
Development
Successfully merging this pull request may close these issues.
Uh oh!
There was an error while loading. Please reload this page.
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.