Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gh-106033: Get rid of PyDict_GetItem in _PyFunction_FromConstructor #106044

Merged
merged 2 commits into from
Jun 29, 2023
Merged

gh-106033: Get rid of PyDict_GetItem in _PyFunction_FromConstructor #106044

merged 2 commits into from
Jun 29, 2023

Conversation

serhiy-storchaka
Copy link
Member

@serhiy-storchaka serhiy-storchaka commented Jun 23, 2023 •
edited by bedevere-bot
Loading

@bedevere-bot bedevere-bot mentioned this pull request Jun 23, 2023
Closed
polynomialherder added a commit to polynomialherder/cpython that referenced this pull request Jun 24, 2023
@polynomialherder
pythongh-106044: Fix whitespace
6921930
gpshead
gpshead reviewed Jun 24, 2023
View reviewed changes
Objects/funcobject.c
PyObject *module = Py_XNewRef(PyDict_GetItemWithError(constr->fc_globals, &_Py_ID(__name__)));
if (!module && PyErr_Occurred()) {
return NULL;
}

PyFunctionObject *op = PyObject_GC_New(PyFunctionObject, &PyFunction_Type);
if (op == NULL) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Py_XDECREF(module) before this error return.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!

@serhiy-storchaka serhiy-storchaka merged commit 08c08d2 into python:main Jun 29, 2023
14 checks passed
@miss-islington
Copy link
Contributor

Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

@serhiy-storchaka serhiy-storchaka deleted the _PyFunction_FromConstructor branch June 29, 2023 09:31
@miss-islington
Copy link
Contributor

Sorry, @serhiy-storchaka, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 08c08d21b03d949452a77d9ed5e3cf48d6b9804d 3.11

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 29, 2023
@serhiy-storchaka @miss-islington
pythongh-106033: Get rid of PyDict_GetItem in _PyFunction_FromConstru…
aba4a91 
…ctor (pythonGH-106044)

(cherry picked from commit 08c08d2)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@bedevere-bot
Copy link

GH-106228 is a backport of this pull request to the 3.12 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.12 bug and security fixes label Jun 29, 2023
@serhiy-storchaka serhiy-storchaka removed the needs backport to 3.11 only security fixes label Jun 29, 2023
serhiy-storchaka added a commit that referenced this pull request Jun 29, 2023
@miss-islington @serhiy-storchaka
[3.12] gh-106033: Get rid of PyDict_GetItem in _PyFunction_FromConstr…
e0fa531 
…uctor (GH-106044) (GH-106228)

gh-106033: Get rid of PyDict_GetItem in _PyFunction_FromConstructor (GH-106044)
(cherry picked from commit 08c08d2)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@serhiy-storchaka serhiy-storchaka removed their assignment Jul 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gpshead gpshead gpshead left review comments

Assignees
No one assigned
Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@serhiy-storchaka @miss-islington @bedevere-bot @gpshead