MNT: migrate away from deprecated c-api #17680
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The new macros were added in py33 so all versions of Python we support have them. closes matplotlib#17629
anntzer
reviewed
Jun 18, 2020
| @@ -635,11 +635,10 @@ static PyObject *PyFT2Font_set_text(PyFT2Font *self, PyObject *args, PyObject *k | |||
| size_t size; | |||
|
|
|||
| if (PyUnicode_Check(textobj)) { | |||
| size = PyUnicode_GET_SIZE(textobj); | |||
| size = PyUnicode_GET_LENGTH(textobj); | |||
| codepoints.resize(size); | |||
There was a problem hiding this comment.
maybe simpler and more efficient to just use https://docs.python.org/3/c-api/unicode.html#c.PyUnicode_AsUCS4 or https://docs.python.org/3/c-api/unicode.html#c.PyUnicode_AsUCS4Copy instead of managing and additional temporay buffer ourselves?
Edit: Bah, it's too complicated given that we also support bytes input.
There was a problem hiding this comment.
My goal here was the minimal fix to get us off to non-deprecated API. There is some discussion of removing the deprecated macros in 3.11 so I would rather get something in ASAP.
6 tasks
QuLogic
approved these changes
Jun 19, 2020
WeatherGod
approved these changes
Jun 20, 2020
meeseeksmachine
pushed a commit
to meeseeksmachine/matplotlib
that referenced
this pull request
Jun 20, 2020
QuLogic
added a commit
that referenced
this pull request
Jun 20, 2020
…680-on-v3.3.x Backport PR #17680 on branch v3.3.x (MNT: migrate away from deprecated c-api)
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The new macros were added in py33 so all versions of Python we support
have them.
closes #17629