RustPython · youknowone · Feb 1, 2023 · Jan 28, 2023 · Jan 28, 2023 · Jan 31, 2023
diff --git a/Lib/test/test_dataclasses.py b/Lib/test/test_dataclasses.py
@@ -1954,8 +1954,6 @@ class R:
                    self.assertEqual(new_sample.x, another_new_sample.x)
                    self.assertEqual(sample.y, another_new_sample.y)

-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
    def test_dataclasses_qualnames(self):
        @dataclass(order=True, unsafe_hash=True, frozen=True)
        class A:
@@ -3442,8 +3440,6 @@ class C:
        self.assertEqual(c1.x, 3)
        self.assertEqual(c1.y, 2)

-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
    def test_frozen(self):
        @dataclass(frozen=True)
        class C:
@@ -3476,8 +3472,6 @@ class C:
                                             "keyword argument 'a'"):
            c1 = replace(c, x=20, a=5)

-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
    def test_invalid_field_name(self):
        @dataclass(frozen=True)
        class C:
@@ -3521,8 +3515,6 @@ class C:
        with self.assertRaisesRegex(ValueError, 'init=False'):
            replace(c, y=30)

-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
    def test_classvar(self):
        @dataclass
        class C:

diff --git a/vm/src/builtins/function.rs b/vm/src/builtins/function.rs
@@ -101,7 +101,9 @@ impl PyFunction {
            if nargs > nexpected_args {
                return Err(vm.new_type_error(format!(
                    "{}() takes {} positional arguments but {} were given",
-                    &self.code.obj_name, nexpected_args, nargs
+                    self.qualname(),
+                    nexpected_args,
+                    nargs
                )));
            }
        }
@@ -132,25 +134,29 @@ impl PyFunction {
            if let Some(pos) = argpos(code.posonlyarg_count..total_args, &name) {
                let slot = &mut fastlocals[pos];
                if slot.is_some() {
-                    return Err(
-                        vm.new_type_error(format!("Got multiple values for argument '{name}'"))
-                    );
+                    return Err(vm.new_type_error(format!(
+                        "{}() got multiple values for argument '{}'",
+                        self.qualname(),
+                        name
+                    )));
                }
                *slot = Some(value);
            } else if let Some(kwargs) = kwargs.as_ref() {
                kwargs.set_item(&name, value, vm)?;
            } else if argpos(0..code.posonlyarg_count, &name).is_some() {
                posonly_passed_as_kwarg.push(name);
            } else {
-                return Err(
-                    vm.new_type_error(format!("got an unexpected keyword argument '{name}'"))
-                );
+                return Err(vm.new_type_error(format!(
+                    "{}() got an unexpected keyword argument '{}'",
+                    self.qualname(),
+                    name
+                )));
            }
        }
        if !posonly_passed_as_kwarg.is_empty() {
            return Err(vm.new_type_error(format!(
                "{}() got some positional-only arguments passed as keyword arguments: '{}'",
-                &self.code.obj_name,
+                self.qualname(),
                posonly_passed_as_kwarg.into_iter().format(", "),
            )));
        }
@@ -207,7 +213,7 @@ impl PyFunction {

                return Err(vm.new_type_error(format!(
                    "{}() missing {} required positional argument{}: '{}{}{}'",
-                    &self.code.obj_name,
+                    self.qualname(),
                    missing_args_len,
                    if missing_args_len == 1 { "" } else { "s" },
                    missing.iter().join("', '"),