Rework uwsgi module handling
#2590
Open
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
xrmx
reviewed
Dec 26, 2023
plugins/python/python_plugin.c
Outdated
| @@ -698,10 +695,20 @@ void init_uwsgi_embedded_module() { | |||
|
|
|||
|
|
|||
| #ifdef PYTHREE | |||
| #ifndef UWSGI_PY312 | |||
| # ifndef UWSGI_PY312 | |||
There was a problem hiding this comment.
could you keep all the ifdefery at column 0 please?
Lalufu
force-pushed
the
lalufu/feature-python312-part-2
branch
from
5d4aab0 to
7865982
Compare
This partially reverts some of the work done in 1881628. This removes some code reordering done in the above commit to work around the fact that, starting in 3.12, `PyImport_AppendInittab()` could no longer be called after `Py_Initialize()`. This patch reverts this reordering, and takes a different approach to add the `uwsgi` python module to the plugin. This is mainly done to support the https://pypi.org/project/pyuwsgi/ use case where the uwsgi server itself is a python module, and hence the interpreter will always be initialized before uwsgi even starts. It's also a bit cleaner, there's less code getting rearranged to support 3.12.
Lalufu
force-pushed
the
lalufu/feature-python312-part-2
branch
from
7865982 to
973fc9a
Compare
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.
This partially reverts some of the work done in
1881628.
This removes some code reordering done in the above commit to work around the fact that, starting in 3.12,
PyImport_AppendInittab()could no longer be called afterPy_Initialize().This patch reverts this reordering, and takes a different approach to add the
uwsgipython module to the plugin.This is mainly done to support the https://pypi.org/project/pyuwsgi/ use case where the uwsgi server itself is a python module, and hence the interpreter will always be initialized before uwsgi even starts.
It's also a bit cleaner, there's less code getting rearranged to support 3.12.