__{get,set,del}item__ without pymethods (#6622)

youknowone · web-flow · commit 2e2924801c96 · 2026-01-02T08:29:42.000+09:00
* __getitem__ without pymethod

* __setitem__ __delitem__ without pymethod

* sort slot names
diff --git a/crates/stdlib/src/array.rs b/crates/stdlib/src/array.rs
@@ -996,7 +996,6 @@ mod array {
             }
         }
 
-        #[pymethod]
         fn __getitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {
             self.getitem_inner(&needle, vm)
         }
@@ -1038,7 +1037,6 @@ mod array {
             }
         }
 
-        #[pymethod]
         fn __setitem__(
             zelf: &Py<Self>,
             needle: PyObjectRef,
@@ -1055,7 +1053,6 @@ mod array {
             }
         }
 
-        #[pymethod]
         fn __delitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
             self.delitem_inner(&needle, vm)
         }
diff --git a/crates/stdlib/src/contextvars.rs b/crates/stdlib/src/contextvars.rs
@@ -189,7 +189,6 @@ mod _contextvars {
             }
         }
 
-        #[pymethod]
         fn __getitem__(
             &self,
             var: PyRef<ContextVar>,
diff --git a/crates/stdlib/src/mmap.rs b/crates/stdlib/src/mmap.rs
@@ -1240,12 +1240,10 @@ mod mmap {
             Ok(())
         }
 
-        #[pymethod]
         fn __getitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyObjectRef> {
             self.getitem_inner(&needle, vm)
         }
 
-        #[pymethod]
         fn __setitem__(
             zelf: &Py<Self>,
             needle: PyObjectRef,
diff --git a/crates/vm/src/builtins/bytearray.rs b/crates/vm/src/builtins/bytearray.rs
@@ -238,12 +238,10 @@ impl PyByteArray {
         Ok(zelf)
     }
 
-    #[pymethod]
     fn __getitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         self._getitem(&needle, vm)
     }
 
-    #[pymethod]
     pub fn __delitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
         self._delitem(&needle, vm)
     }
@@ -549,7 +547,6 @@ impl PyByteArray {
 
 #[pyclass]
 impl Py<PyByteArray> {
-    #[pymethod]
     fn __setitem__(
         &self,
         needle: PyObjectRef,
diff --git a/crates/vm/src/builtins/bytes.rs b/crates/vm/src/builtins/bytes.rs
@@ -241,7 +241,6 @@ impl PyBytes {
         PyBytesInner::maketrans(from, to, vm)
     }
 
-    #[pymethod]
     fn __getitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         self._getitem(&needle, vm)
     }
diff --git a/crates/vm/src/builtins/dict.rs b/crates/vm/src/builtins/dict.rs
@@ -225,7 +225,6 @@ impl PyDict {
         self.entries.contains(vm, &*key)
     }
 
-    #[pymethod]
     fn __delitem__(&self, key: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
         self.inner_delitem(&*key, vm)
     }
@@ -235,7 +234,6 @@ impl PyDict {
         self.entries.clear()
     }
 
-    #[pymethod]
     fn __setitem__(
         &self,
         key: PyObjectRef,
@@ -372,7 +370,6 @@ impl Py<PyDict> {
         Ok(Implemented(true))
     }
 
-    #[pymethod]
     #[cfg_attr(feature = "flame-it", flame("PyDictRef"))]
     fn __getitem__(&self, key: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         self.inner_getitem(&*key, vm)
diff --git a/crates/vm/src/builtins/genericalias.rs b/crates/vm/src/builtins/genericalias.rs
@@ -189,7 +189,6 @@ impl PyGenericAlias {
         }
     }
 
-    #[pymethod]
     fn __getitem__(zelf: PyRef<Self>, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         let new_args = subs_parameters(
             zelf.to_owned().into(),
diff --git a/crates/vm/src/builtins/list.rs b/crates/vm/src/builtins/list.rs
@@ -213,7 +213,6 @@ impl PyList {
         }
     }
 
-    #[pymethod]
     fn __getitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         self._getitem(&needle, vm)
     }
@@ -228,7 +227,6 @@ impl PyList {
         }
     }
 
-    #[pymethod]
     fn __setitem__(
         &self,
         needle: PyObjectRef,
@@ -308,7 +306,6 @@ impl PyList {
         }
     }
 
-    #[pymethod]
     fn __delitem__(&self, subscript: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
         self._delitem(&subscript, vm)
     }
diff --git a/crates/vm/src/builtins/mappingproxy.rs b/crates/vm/src/builtins/mappingproxy.rs
@@ -111,7 +111,6 @@ impl PyMappingProxy {
         )?))
     }
 
-    #[pymethod]
     pub fn __getitem__(&self, key: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         self.get_inner(key.clone(), vm)?
             .ok_or_else(|| vm.new_key_error(key))
diff --git a/crates/vm/src/builtins/memory.rs b/crates/vm/src/builtins/memory.rs
@@ -659,7 +659,6 @@ impl PyMemoryView {
         self.release();
     }
 
-    #[pymethod]
     fn __getitem__(zelf: PyRef<Self>, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         zelf.try_not_released(vm)?;
         if zelf.desc.ndim() == 0 {
@@ -682,7 +681,6 @@ impl PyMemoryView {
         }
     }
 
-    #[pymethod]
     fn __delitem__(&self, _needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
         if self.desc.readonly {
             return Err(vm.new_type_error("cannot modify read-only memory"));
@@ -847,7 +845,6 @@ impl PyMemoryView {
 
 #[pyclass]
 impl Py<PyMemoryView> {
-    #[pymethod]
     fn __setitem__(
         &self,
         needle: PyObjectRef,
diff --git a/crates/vm/src/builtins/range.rs b/crates/vm/src/builtins/range.rs
@@ -279,7 +279,6 @@ impl PyRange {
         (vm.ctx.types.range_type.to_owned(), range_parameters_tuple)
     }
 
-    #[pymethod]
     fn __getitem__(&self, subscript: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         match RangeIndex::try_from_object(vm, subscript)? {
             RangeIndex::Slice(slice) => {
diff --git a/crates/vm/src/builtins/str.rs b/crates/vm/src/builtins/str.rs
@@ -584,7 +584,6 @@ impl PyStr {
         Ok(item)
     }
 
-    #[pymethod]
     fn __getitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         self._getitem(&needle, vm)
     }
diff --git a/crates/vm/src/builtins/tuple.rs b/crates/vm/src/builtins/tuple.rs
@@ -315,7 +315,6 @@ impl PyTuple {
         }
     }
 
-    #[pymethod]
     fn __getitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         self._getitem(&needle, vm)
     }
diff --git a/crates/vm/src/builtins/type.rs b/crates/vm/src/builtins/type.rs
@@ -439,7 +439,10 @@ impl PyType {
                 slot_name_set.insert(name);
             }
         }
-        for attr_name in slot_name_set {
+        // Sort for deterministic iteration order (important for slot processing)
+        let mut slot_names: Vec<_> = slot_name_set.into_iter().collect();
+        slot_names.sort_by_key(|name| name.as_str());
+        for attr_name in slot_names {
             self.update_slot::<true>(attr_name, ctx);
         }
 
diff --git a/crates/vm/src/stdlib/collections.rs b/crates/vm/src/stdlib/collections.rs
@@ -278,15 +278,13 @@ mod _collections {
             self.maxlen
         }
 
-        #[pymethod]
         fn __getitem__(&self, idx: isize, vm: &VirtualMachine) -> PyResult {
             let deque = self.borrow_deque();
             idx.wrapped_at(deque.len())
                 .and_then(|i| deque.get(i).cloned())
                 .ok_or_else(|| vm.new_index_error("deque index out of range"))
         }
 
-        #[pymethod]
         fn __setitem__(&self, idx: isize, value: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
             let mut deque = self.borrow_deque_mut();
             idx.wrapped_at(deque.len())
@@ -295,7 +293,6 @@ mod _collections {
                 .ok_or_else(|| vm.new_index_error("deque index out of range"))
         }
 
-        #[pymethod]
         fn __delitem__(&self, idx: isize, vm: &VirtualMachine) -> PyResult<()> {
             let mut deque = self.borrow_deque_mut();
             idx.wrapped_at(deque.len())
diff --git a/crates/vm/src/stdlib/ctypes/array.rs b/crates/vm/src/stdlib/ctypes/array.rs
@@ -940,7 +940,6 @@ impl PyCArray {
     }
 
     // Array_subscript
-    #[pymethod]
     fn __getitem__(zelf: &Py<Self>, item: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         // PyIndex_Check
         if let Some(i) = item.downcast_ref::<PyInt>() {
@@ -1047,7 +1046,6 @@ impl PyCArray {
     }
 
     // Array_ass_subscript
-    #[pymethod]
     fn __setitem__(
         zelf: &Py<Self>,
         item: PyObjectRef,
@@ -1074,7 +1072,6 @@ impl PyCArray {
     }
 
     // Array does not support item deletion
-    #[pymethod]
     fn __delitem__(&self, _item: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
         Err(vm.new_type_error("Array does not support item deletion"))
     }
diff --git a/crates/vm/src/stdlib/ctypes/pointer.rs b/crates/vm/src/stdlib/ctypes/pointer.rs
@@ -346,7 +346,6 @@ impl PyCPointer {
     }
 
     // Pointer_subscript
-    #[pymethod]
     fn __getitem__(zelf: &Py<Self>, item: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         // PyIndex_Check
         if let Some(i) = item.downcast_ref::<PyInt>() {
@@ -529,7 +528,6 @@ impl PyCPointer {
     }
 
     // Pointer_ass_item
-    #[pymethod]
     fn __setitem__(
         zelf: &Py<Self>,
         item: PyObjectRef,
diff --git a/crates/vm/src/stdlib/sre.rs b/crates/vm/src/stdlib/sre.rs
@@ -737,7 +737,6 @@ mod _sre {
             })
         }
 
-        #[pymethod]
         fn __getitem__(
             &self,
             group: PyObjectRef,

Original file line number	Diff line number	Diff line change
`@@ -996,7 +996,6 @@ mod array {`
`996`	`996`	`}`
`997`	`997`	`}`
`998`	`998`
`999`		`- #[pymethod]`
`1000`	`999`	`fn __getitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {`
`1001`	`1000`	`self.getitem_inner(&needle, vm)`
`1002`	`1001`	`}`
`@@ -1038,7 +1037,6 @@ mod array {`
`1038`	`1037`	`}`
`1039`	`1038`	`}`
`1040`	`1039`
`1041`		`- #[pymethod]`
`1042`	`1040`	`fn __setitem__(`
`1043`	`1041`	`zelf: &Py<Self>,`
`1044`	`1042`	`needle: PyObjectRef,`
`@@ -1055,7 +1053,6 @@ mod array {`
`1055`	`1053`	`}`
`1056`	`1054`	`}`
`1057`	`1055`
`1058`		`- #[pymethod]`
`1059`	`1056`	`fn __delitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {`
`1060`	`1057`	`self.delitem_inner(&needle, vm)`
`1061`	`1058`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,6 @@ mod _contextvars {`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`
`192`		`- #[pymethod]`
`193`	`192`	`fn __getitem__(`
`194`	`193`	`&self,`
`195`	`194`	`var: PyRef<ContextVar>,`
Original file line number	Diff line number	Diff line change
`@@ -1240,12 +1240,10 @@ mod mmap {`
`1240`	`1240`	`Ok(())`
`1241`	`1241`	`}`
`1242`	`1242`
`1243`		`- #[pymethod]`
`1244`	`1243`	`fn __getitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyObjectRef> {`
`1245`	`1244`	`self.getitem_inner(&needle, vm)`
`1246`	`1245`	`}`
`1247`	`1246`
`1248`		`- #[pymethod]`
`1249`	`1247`	`fn __setitem__(`
`1250`	`1248`	`zelf: &Py<Self>,`
`1251`	`1249`	`needle: PyObjectRef,`
Original file line number	Diff line number	Diff line change
`@@ -238,12 +238,10 @@ impl PyByteArray {`
`238`	`238`	`Ok(zelf)`
`239`	`239`	`}`
`240`	`240`
`241`		`- #[pymethod]`
`242`	`241`	`fn __getitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {`
`243`	`242`	`self._getitem(&needle, vm)`
`244`	`243`	`}`
`245`	`244`
`246`		`- #[pymethod]`
`247`	`245`	`pub fn __delitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {`
`248`	`246`	`self._delitem(&needle, vm)`
`249`	`247`	`}`
`@@ -549,7 +547,6 @@ impl PyByteArray {`
`549`	`547`
`550`	`548`	`#[pyclass]`
`551`	`549`	`impl Py<PyByteArray> {`
`552`		`- #[pymethod]`
`553`	`550`	`fn __setitem__(`
`554`	`551`	`&self,`
`555`	`552`	`needle: PyObjectRef,`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,6 @@ impl PyBytes {`
`241`	`241`	`PyBytesInner::maketrans(from, to, vm)`
`242`	`242`	`}`
`243`	`243`
`244`		`- #[pymethod]`
`245`	`244`	`fn __getitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {`
`246`	`245`	`self._getitem(&needle, vm)`
`247`	`246`	`}`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,6 @@ impl PyDict {`
`225`	`225`	`self.entries.contains(vm, &*key)`
`226`	`226`	`}`
`227`	`227`
`228`		`- #[pymethod]`
`229`	`228`	`fn __delitem__(&self, key: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {`
`230`	`229`	`self.inner_delitem(&*key, vm)`
`231`	`230`	`}`
`@@ -235,7 +234,6 @@ impl PyDict {`
`235`	`234`	`self.entries.clear()`
`236`	`235`	`}`
`237`	`236`
`238`		`- #[pymethod]`
`239`	`237`	`fn __setitem__(`
`240`	`238`	`&self,`
`241`	`239`	`key: PyObjectRef,`
`@@ -372,7 +370,6 @@ impl Py<PyDict> {`
`372`	`370`	`Ok(Implemented(true))`
`373`	`371`	`}`
`374`	`372`
`375`		`- #[pymethod]`
`376`	`373`	`#[cfg_attr(feature = "flame-it", flame("PyDictRef"))]`
`377`	`374`	`fn __getitem__(&self, key: PyObjectRef, vm: &VirtualMachine) -> PyResult {`
`378`	`375`	`self.inner_getitem(&*key, vm)`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,6 @@ impl PyGenericAlias {`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`
`192`		`- #[pymethod]`
`193`	`192`	`fn __getitem__(zelf: PyRef<Self>, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {`
`194`	`193`	`let new_args = subs_parameters(`
`195`	`194`	`zelf.to_owned().into(),`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,6 @@ impl PyList {`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`
`216`		`- #[pymethod]`
`217`	`216`	`fn __getitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {`
`218`	`217`	`self._getitem(&needle, vm)`
`219`	`218`	`}`
`@@ -228,7 +227,6 @@ impl PyList {`
`228`	`227`	`}`
`229`	`228`	`}`
`230`	`229`
`231`		`- #[pymethod]`
`232`	`230`	`fn __setitem__(`
`233`	`231`	`&self,`
`234`	`232`	`needle: PyObjectRef,`
`@@ -308,7 +306,6 @@ impl PyList {`
`308`	`306`	`}`
`309`	`307`	`}`
`310`	`308`
`311`		`- #[pymethod]`
`312`	`309`	`fn __delitem__(&self, subscript: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {`
`313`	`310`	`self._delitem(&subscript, vm)`
`314`	`311`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,6 @@ impl PyMappingProxy {`
`111`	`111`	`)?))`
`112`	`112`	`}`
`113`	`113`
`114`		`- #[pymethod]`
`115`	`114`	`pub fn __getitem__(&self, key: PyObjectRef, vm: &VirtualMachine) -> PyResult {`
`116`	`115`	`self.get_inner(key.clone(), vm)?`
`117`	`116`	`.ok_or_else(\|\| vm.new_key_error(key))`
Original file line number	Diff line number	Diff line change
`@@ -659,7 +659,6 @@ impl PyMemoryView {`
`659`	`659`	`self.release();`
`660`	`660`	`}`
`661`	`661`
`662`		`- #[pymethod]`
`663`	`662`	`fn __getitem__(zelf: PyRef<Self>, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {`
`664`	`663`	`zelf.try_not_released(vm)?;`
`665`	`664`	`if zelf.desc.ndim() == 0 {`
`@@ -682,7 +681,6 @@ impl PyMemoryView {`
`682`	`681`	`}`
`683`	`682`	`}`
`684`	`683`
`685`		`- #[pymethod]`
`686`	`684`	`fn __delitem__(&self, _needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {`
`687`	`685`	`if self.desc.readonly {`
`688`	`686`	`return Err(vm.new_type_error("cannot modify read-only memory"));`
`@@ -847,7 +845,6 @@ impl PyMemoryView {`
`847`	`845`
`848`	`846`	`#[pyclass]`
`849`	`847`	`impl Py<PyMemoryView> {`
`850`		`- #[pymethod]`
`851`	`848`	`fn __setitem__(`
`852`	`849`	`&self,`
`853`	`850`	`needle: PyObjectRef,`