Skip to content

Fix error messages in binary/ternary ops to match CPython format #7625

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

Merged
youknowone merged 2 commits into from
Apr 19, 2026
+2 −4
Merged

Fix error messages in binary/ternary ops to match CPython format #7625

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
adb8e1c
Fix `divmod` error message to match CPython format
changjoon-park Apr 18, 2026
467b6dd
Fix ternary op error message separator to match CPython
changjoon-park Apr 18, 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
2 changes: 0 additions & 2 deletions Lib/test/test_fractions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1669,7 +1669,6 @@ def test_float_format_testfile(self):
self.assertEqual(float(format(f, fmt2)), float(rhs))
self.assertEqual(float(format(-f, fmt2)), float('-' + rhs))

@unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: '%' not supported between instances of 'Fraction' and 'complex'
def test_complex_handling(self):
# See issue gh-102840 for more details.

Expand Down Expand Up @@ -1697,7 +1696,6 @@ def test_complex_handling(self):
message % ("divmod()", "complex", "Fraction"),
divmod, b, a)

@unittest.expectedFailure # TODO: RUSTPYTHON; Wrong error message
def test_three_argument_pow(self):
message = "unsupported operand type(s) for ** or pow(): '%s', '%s', '%s'"
self.assertRaisesMessage(TypeError,
Expand Down
4 changes: 2 additions & 2 deletions crates/vm/src/vm/vm_ops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ impl VirtualMachine {
} else {
self.new_type_error(format!(
"unsupported operand type(s) for {}: \
'{}' and '{}', '{}'",
'{}', '{}', '{}'",
op_str,
a.class(),
b.class(),
Expand Down Expand Up @@ -401,7 +401,7 @@ impl VirtualMachine {

binary_func!(_sub, Subtract, "-");
binary_func!(_mod, Remainder, "%");
binary_func!(_divmod, Divmod, "divmod");
binary_func!(_divmod, Divmod, "divmod()");
binary_func!(_lshift, Lshift, "<<");
binary_func!(_rshift, Rshift, ">>");
binary_func!(_and, And, "&");
Expand Down
Loading