Fix cell_contents (#5822)

youknowone · web-flow · commit b0b39194dd94 · 2025-06-23T08:59:07.000+09:00
diff --git a/Lib/test/test_funcattrs.py b/Lib/test/test_funcattrs.py
@@ -140,8 +140,6 @@ def f(): print(a)
             self.fail("shouldn't be able to read an empty cell")
         a = 12
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_set_cell(self):
         a = 12
         def f(): return a
diff --git a/vm/src/builtins/function.rs b/vm/src/builtins/function.rs
@@ -759,8 +759,11 @@ impl PyCell {
             .ok_or_else(|| vm.new_value_error("Cell is empty".to_owned()))
     }
     #[pygetset(setter)]
-    fn set_cell_contents(&self, x: PyObjectRef) {
-        self.set(Some(x))
+    fn set_cell_contents(&self, x: PySetterValue) {
+        match x {
+            PySetterValue::Assign(value) => self.set(Some(value)),
+            PySetterValue::Delete => self.set(None),
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -759,8 +759,11 @@ impl PyCell {`
`759`	`759`	`.ok_or_else(\|\| vm.new_value_error("Cell is empty".to_owned()))`
`760`	`760`	`}`
`761`	`761`	`#[pygetset(setter)]`
`762`		`- fn set_cell_contents(&self, x: PyObjectRef) {`
`763`		`- self.set(Some(x))`
	`762`	`+ fn set_cell_contents(&self, x: PySetterValue) {`
	`763`	`+ match x {`
	`764`	`+ PySetterValue::Assign(value) => self.set(Some(value)),`
	`765`	`+ PySetterValue::Delete => self.set(None),`
	`766`	`+ }`
`764`	`767`	`}`
`765`	`768`	`}`
`766`	`769`