Skip to content

Fix SyntaxError, UnicodeDecodeError #5807

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 4 commits into from
Jun 20, 2025
Merged

Fix SyntaxError, UnicodeDecodeError #5807

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76a4e71
Fix SyntaxError
youknowone Jun 20, 2025
9d3f24a
Fix UnicodeDecodeError
youknowone Jun 20, 2025
1779519
fix instruction
youknowone Jun 20, 2025
d016920
Fix ImportError
youknowone Jun 20, 2025
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
Prev Previous commit
Fix ImportError
  • Loading branch information
@youknowone
youknowone committed Jun 20, 2025
commit d016920ea392f0b555d944262925012498ff5503
4 changes: 0 additions & 4 deletions Lib/test/test_exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2349,8 +2349,6 @@ def __getattribute__(self, attr):


class ImportErrorTests(unittest.TestCase):
# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_attributes(self):
# Setting 'name' and 'path' should not be a problem.
exc = ImportError('test')
Expand Down Expand Up @@ -2385,8 +2383,6 @@ def test_attributes(self):
with self.assertRaisesRegex(TypeError, msg):
ImportError('test', invalid='keyword', another=True)

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_reset_attributes(self):
exc = ImportError('test', name='name', path='path')
self.assertEqual(exc.args, ('test',))
Expand Down
26 changes: 15 additions & 11 deletions vm/src/exceptions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1308,17 +1308,21 @@ pub(super) mod types {
args: ::rustpython_vm::function::FuncArgs,
vm: &::rustpython_vm::VirtualMachine,
) -> ::rustpython_vm::PyResult<()> {
zelf.set_attr(
"name",
vm.unwrap_or_none(args.kwargs.get("name").cloned()),
vm,
)?;
zelf.set_attr(
"path",
vm.unwrap_or_none(args.kwargs.get("path").cloned()),
vm,
)?;
Ok(())
let mut kwargs = args.kwargs.clone();
let name = kwargs.swap_remove("name");
let path = kwargs.swap_remove("path");

// Check for any remaining invalid keyword arguments
if let Some(invalid_key) = kwargs.keys().next() {
return Err(vm.new_type_error(format!(
"'{}' is an invalid keyword argument for ImportError",
invalid_key
)));
}

zelf.set_attr("name", vm.unwrap_or_none(name), vm)?;
zelf.set_attr("path", vm.unwrap_or_none(path), vm)?;
PyBaseException::slot_init(zelf, args, vm)
}
#[pymethod(magic)]
fn reduce(exc: PyBaseExceptionRef, vm: &VirtualMachine) -> PyTupleRef {
Expand Down
Loading