Skip to content

gh-146199: Fix error handling in code_richcompare when PyObject_RichCompareBool fails #146200

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

Open
bkap123 wants to merge 2 commits into
base: main
Choose a base branch
from
+13 −1
Open

gh-146199: Fix error handling in code_richcompare when PyObject_RichCompareBool fails #146200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a388f88
gh-146199: Fix error handling in `code_richcompare` when `PyObject_Ri…
bkap123 Mar 20, 2026
1d128a6
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Lib/test/test_code.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,6 +1164,17 @@ def test_stateless(self):
with self.assertRaises(Exception):
_testinternalcapi.verify_stateless_code(func)

def test_code_richcompare_raise_exception(self):
class BadStr(str):
def __eq__(self, _):
raise RuntimeError("Poison!")
def __hash__(self): return str.__hash__(self)
Comment on lines +1168 to +1171
Copy link
Member

@vstinner vstinner Mar 20, 2026

Choose a reason for hiding this comment

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

There is no need to redefine the __hash__() method:

Suggested change
class BadStr(str):
def __eq__(self, _):
raise RuntimeError("Poison!")
def __hash__(self): return str.__hash__(self)
class BadStr(str):
def __eq__(self, _):
raise RuntimeError("Poison!")


c1 = compile("pass", "test", "exec")
c2 = c1.replace(co_name=BadStr("poison"))
c3 = compile("pass", "poison", "exec")
with self.assertRaises(RuntimeError):
_ = c2 == c3
Copy link
Member

@vstinner vstinner Mar 20, 2026

Choose a reason for hiding this comment

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

Suggested change
_ = c2 == c3
c2 == c3


def isinterned(s):
return s is sys.intern(('_' + s + '_')[1:-1])
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2026-03-20-12-26-24.gh-issue-146199.vV8V9s.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Comparison of code objects now handles errors correctly.
2 changes: 1 addition & 1 deletion Objects/codeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2606,7 +2606,7 @@ code_richcompare(PyObject *self, PyObject *other, int op)
cp = (PyCodeObject *)other;

eq = PyObject_RichCompareBool(co->co_name, cp->co_name, Py_EQ);
if (!eq) goto unequal;
if (eq <= 0) goto unequal;
eq = co->co_argcount == cp->co_argcount;
if (!eq) goto unequal;
eq = co->co_posonlyargcount == cp->co_posonlyargcount;
Expand Down
Loading