FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-94808: Cover `LOAD_GLOBAL` for custom dict subtypes by sobolevn · Pull Request #96767 · python/cpython · GitHub

/ cpython Public

gh-94808: Cover LOAD_GLOBAL for custom dict subtypes - #96767

Merged
iritkatriel merged 3 commits into
python:mainfrom
sobolevn:cover-load-global-custom-dicts
Nov 4, 2022
ConversationCommits (3)ChecksFiles changed
Merged

gh-94808: Cover LOAD_GLOBAL for custom dict subtypes#96767
iritkatriel merged 3 commits into
python:mainfrom
sobolevn:cover-load-global-custom-dicts

Conversation

sobolevn commented Sep 12, 2022 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

I've covered several missing conditions in TARGET(LOAD_GLOBAL):

  • The one where custom globals() dict subtype raises non KeyError:

    cpython/Python/ceval.c

    Lines 2445 to 2447 in 53a54b7

    if (!_PyErr_ExceptionMatches(tstate, PyExc_KeyError)) {
    goto error;
    }
  • Similar case where __builtins__ dict subtype raises non KeyError:

    cpython/Python/ceval.c

    Line 2458 in 53a54b7

    goto error;
  • Regular NameError in a custom __builtins__ dict subtype:

    cpython/Python/ceval.c

    Lines 2453 to 2457 in 53a54b7

    if (_PyErr_ExceptionMatches(tstate, PyExc_KeyError)) {
    format_exc_check_arg(
    tstate, PyExc_NameError,
    NAME_ERROR_MSG, name);
    }

bedevere-bot added awaiting review tests Tests in the Lib/test dir labels Sep 12, 2022
mdboom approved these changes Sep 12, 2022
View reviewed changes

mdboom left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

LGTM. Thanks for the contribution.

iritkatriel reviewed Nov 3, 2022
View reviewed changes
Comment thread Lib/test/test_builtin.py Outdated
def __getitem__(self, key):
raise setonlyerror

class customdict(dict): # this one should not do anything fancy

iritkatriel Nov 3, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

This should be defined just before the test that uses it (below). Ideally this function would be broken up - it's testing a lot of things.

sobolevn Nov 4, 2022

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Done! Thanks!

bedevere-bot mentioned this pull request Nov 4, 2022
Open
iritkatriel added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Nov 4, 2022
iritkatriel merged commit 044bcc1 into python:main Nov 4, 2022

miss-islington commented Nov 4, 2022

Copy link
Copy Markdown
Contributor

Thanks @sobolevn for the PR, and @iritkatriel for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.11.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 4, 2022
pythongh-94808: Cover LOAD_GLOBAL for custom dict subtypes (pythonG…
6c30789 
…H-96767)

(cherry picked from commit 044bcc1)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

miss-islington commented Nov 4, 2022

Copy link
Copy Markdown
Contributor

Sorry, @sobolevn and @iritkatriel, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 044bcc1771fe7e2f8eba21793a72ba15e75e6715 3.10

bedevere-bot commented Nov 4, 2022

Copy link
Copy Markdown

GH-99091 is a backport of this pull request to the 3.11 branch.

bedevere-bot removed the needs backport to 3.11 only security fixes label Nov 4, 2022
iritkatriel pushed a commit that referenced this pull request Nov 4, 2022
[3.11] gh-94808: Cover LOAD_GLOBAL for custom dict subtypes (GH-96767…
2b79f4e 
…) (GH-99091)
ZeroIntensity removed the needs backport to 3.10 only security fixes label Feb 17, 2025
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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

mdboom mdboom approved these changes
iritkatriel iritkatriel approved these changes
brandtbucher Awaiting requested review from brandtbucher

Assignees

iritkatriel

Labels

skip news tests Tests in the Lib/test dir

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

Back | FazBrowse Home | New Git URL