Clean up uses of deprecated CPython APIs #731
Merged
Conversation
This file contains 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
Hoikas
reviewed
Nov 6, 2020
| @@ -79,7 +79,7 @@ void PythonInterface::initPython(const plFileName& rootDir, const std::vector<pl | |||
| config.optimization_level = 2; | |||
| config.write_bytecode = 0; | |||
| config.user_site_directory = 0; | |||
| config.program_name = L"plasma"; | |||
| PyConfig_SetString(&config, &config.program_name, L"plasma"); | |||
There was a problem hiding this comment.
Related: I learned later that PyConfig can leak memory and it needs to be freed with PyConfig_Clear 😢
There was a problem hiding this comment.
Ah, I was wondering how this didn't crash, since Python expects program_name to be dynamically allocated... Not calling PyConfig_Clear would certainly explain that :)
Comment on lines
-206
to
+211
| uint8_t* daBuffer = nil; | ||
| Py_ssize_t length; | ||
| PyObject_AsReadBuffer( buffer_object, (const void**)&daBuffer, &length); | ||
| Py_buffer view; | ||
| PyObject_GetBuffer(buffer_object, &view, PyBUF_SIMPLE); | ||
| uint8_t* daBuffer = (uint8_t*)view.buf; | ||
| Py_ssize_t length = view.len; | ||
| PyBuffer_Release(&view); | ||
|
|
There was a problem hiding this comment.
As part of the scripts update, I think I completely removed all uses of buffers because of this deprecation. Maybe we should just remove this binding?
Comment on lines
-242
to
+250
| uint16_t* daBuffer = nil; | ||
| Py_ssize_t length; | ||
| PyObject_AsReadBuffer( buffer_object, (const void**)&daBuffer, &length); | ||
| Py_buffer view; | ||
| PyObject_GetBuffer(buffer_object, &view, PyBUF_SIMPLE); | ||
| uint16_t* daBuffer = (uint16_t*)view.buf; | ||
| Py_ssize_t length = view.len; | ||
| PyBuffer_Release(&view); | ||
|
|
|
Let's go ahead and merge this and deal with leaks later. |
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.
No description provided.