Remove arithmatic pymethods

Author: youknowone

crates/stdlib/src/array.rs

@@ -1090,8 +1090,6 @@ mod array {
             Ok(zelf)
         }
 
-        #[pymethod(name = "__rmul__")]
-        #[pymethod]
         fn __mul__(&self, value: isize, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
             self.read()
                 .mul(value, vm)

crates/stdlib/src/cmath.rs

@@ -70,7 +70,12 @@ mod cmath {
 
     #[pyfunction]
     fn asin(z: ArgIntoComplex) -> Complex64 {
-        z.asin()
+        let result = z.asin();
+        if z.im == 0.0 && result.im.abs() < 1e-15 {
+            Complex64::new(result.re, 0.0)
+        } else {
+            result
+        }
     }
 
     #[pyfunction]
@@ -80,7 +85,13 @@ mod cmath {
 
     #[pyfunction]
     fn acos(z: ArgIntoComplex) -> Complex64 {
-        z.acos()
+        let result = z.acos();
+        // For real inputs, ensure imaginary part is exactly 0 when it's negligibly small
+        if z.im == 0.0 && result.im.abs() < 1e-15 {
+            Complex64::new(result.re, 0.0)
+        } else {
+            result
+        }
     }
 
     #[pyfunction]

crates/vm/src/builtins/bytearray.rs

@@ -206,7 +206,7 @@ impl PyByteArray {
         self.inner().capacity()
     }
 
-    #[pymethod]
+    // __len__ exposed via AsSequence as wrapper_descriptor
     fn __len__(&self) -> usize {
         self.borrow_buf().len()
     }
@@ -216,12 +216,12 @@ impl PyByteArray {
         size_of::<Self>() + self.borrow_buf().len() * size_of::<u8>()
     }
 
-    #[pymethod]
+    // __add__ exposed via AsSequence as wrapper_descriptor
     fn __add__(&self, other: ArgBytesLike) -> Self {
         self.inner().add(&other.borrow_buf()).into()
     }
 
-    #[pymethod]
+    // __contains__ exposed via AsSequence as wrapper_descriptor
     fn __contains__(
         &self,
         needle: Either<PyBytesInner, PyIntRef>,
@@ -230,7 +230,7 @@ impl PyByteArray {
         self.inner().contains(needle, vm)
     }
 
-    #[pymethod]
+    // __iadd__ exposed via AsSequence as wrapper_descriptor
     fn __iadd__(
         zelf: PyRef<Self>,
         other: ArgBytesLike,
@@ -242,12 +242,12 @@ impl PyByteArray {
         Ok(zelf)
     }
 
-    #[pymethod]
+    // __getitem__ exposed via AsMapping as wrapper_descriptor
     fn __getitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         self._getitem(&needle, vm)
     }
 
-    #[pymethod]
+    // __delitem__ exposed via AsMapping as wrapper_descriptor
     pub fn __delitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
         self._delitem(&needle, vm)
     }
@@ -525,25 +525,24 @@ impl PyByteArray {
         self.inner().title().into()
     }
 
-    #[pymethod(name = "__rmul__")]
-    #[pymethod]
+    // __mul__ and __rmul__ exposed via AsSequence as wrapper_descriptor
     fn __mul__(&self, value: ArgSize, vm: &VirtualMachine) -> PyResult<Self> {
         self.repeat(value.into(), vm)
     }
 
-    #[pymethod]
+    // __imul__ exposed via AsSequence as wrapper_descriptor
     fn __imul__(zelf: PyRef<Self>, value: ArgSize, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
         Self::irepeat(&zelf, value.into(), vm)?;
         Ok(zelf)
     }
 
-    #[pymethod(name = "__mod__")]
+    // __mod__ exposed via AsNumber as wrapper_descriptor
     fn mod_(&self, values: PyObjectRef, vm: &VirtualMachine) -> PyResult<Self> {
         let formatted = self.inner().cformat(values, vm)?;
         Ok(formatted.into())
     }
 
-    #[pymethod]
+    // __rmod__ exposed via AsNumber as wrapper_descriptor
     fn __rmod__(&self, _values: PyObjectRef, vm: &VirtualMachine) -> PyObjectRef {
         vm.ctx.not_implemented()
     }
@@ -562,7 +561,7 @@ impl PyByteArray {
 
 #[pyclass]
 impl Py<PyByteArray> {
-    #[pymethod]
+    // __setitem__ exposed via AsMapping as wrapper_descriptor
     fn __setitem__(
         &self,
         needle: PyObjectRef,

crates/vm/src/builtins/bytes.rs

@@ -204,8 +204,8 @@ impl PyRef<PyBytes> {
     )
 )]
 impl PyBytes {
+    // Exposed via AsSequence.length slot
     #[inline]
-    #[pymethod]
     pub const fn __len__(&self) -> usize {
         self.inner.len()
     }
@@ -225,12 +225,12 @@ impl PyBytes {
         size_of::<Self>() + self.len() * size_of::<u8>()
     }
 
-    #[pymethod]
+    // Exposed via AsSequence.concat slot
     fn __add__(&self, other: ArgBytesLike) -> Vec<u8> {
         self.inner.add(&other.borrow_buf())
     }
 
-    #[pymethod]
+    // Exposed via AsSequence.contains slot
     fn __contains__(
         &self,
         needle: Either<PyBytesInner, PyIntRef>,
@@ -244,7 +244,7 @@ impl PyBytes {
         PyBytesInner::maketrans(from, to, vm)
     }
 
-    #[pymethod]
+    // Exposed via AsMapping.subscript slot
     fn __getitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         self._getitem(&needle, vm)
     }
@@ -513,23 +513,17 @@ impl PyBytes {
         self.inner.title().into()
     }
 
-    #[pymethod(name = "__rmul__")]
-    #[pymethod]
+    // Exposed via AsSequence.repeat slot
     fn __mul__(zelf: PyRef<Self>, value: ArgIndex, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
         zelf.repeat(value.try_to_primitive(vm)?, vm)
     }
 
-    #[pymethod(name = "__mod__")]
-    fn mod_(&self, values: PyObjectRef, vm: &VirtualMachine) -> PyResult<Self> {
+    // Exposed via AsNumber.remainder slot
+    pub(crate) fn mod_(&self, values: PyObjectRef, vm: &VirtualMachine) -> PyResult<Self> {
         let formatted = self.inner.cformat(values, vm)?;
         Ok(formatted.into())
     }
 
-    #[pymethod]
-    fn __rmod__(&self, _values: PyObjectRef, vm: &VirtualMachine) -> PyObjectRef {
-        vm.ctx.not_implemented()
-    }
-
     #[pymethod]
     fn __getnewargs__(&self, vm: &VirtualMachine) -> PyTupleRef {
         let param: Vec<PyObjectRef> = self.elements().map(|x| x.to_pyobject(vm)).collect();

crates/vm/src/builtins/dict.rs

@@ -212,7 +212,7 @@ impl PyDict {
         }
     }
 
-    #[pymethod]
+    // __len__ exposed via AsMapping as wrapper_descriptor
     pub fn __len__(&self) -> usize {
         self.entries.len()
     }
@@ -222,12 +222,12 @@ impl PyDict {
         std::mem::size_of::<Self>() + self.entries.sizeof()
     }
 
-    #[pymethod]
+    // __contains__ exposed via AsSequence as wrapper_descriptor
     fn __contains__(&self, key: PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
         self.entries.contains(vm, &*key)
     }
 
-    #[pymethod]
+    // __delitem__ exposed via AsMapping as wrapper_descriptor
     fn __delitem__(&self, key: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
         self.inner_delitem(&*key, vm)
     }
@@ -237,7 +237,7 @@ impl PyDict {
         self.entries.clear()
     }
 
-    #[pymethod]
+    // __setitem__ exposed via AsMapping as wrapper_descriptor
     fn __setitem__(
         &self,
         key: PyObjectRef,
@@ -294,7 +294,7 @@ impl PyDict {
         Ok(())
     }
 
-    #[pymethod]
+    // __or__ exposed via AsNumber as wrapper_descriptor
     fn __or__(&self, other: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         let other_dict: Result<PyDictRef, _> = other.downcast();
         if let Ok(other) = other_dict {
@@ -375,7 +375,7 @@ impl Py<PyDict> {
         Ok(Implemented(true))
     }
 
-    #[pymethod]
+    // __getitem__ exposed via AsMapping as wrapper_descriptor
     #[cfg_attr(feature = "flame-it", flame("PyDictRef"))]
     fn __getitem__(&self, key: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         self.inner_getitem(&*key, vm)
@@ -404,13 +404,13 @@ impl PyRef<PyDict> {
         PyDictReverseKeyIterator::new(self)
     }
 
-    #[pymethod]
+    // __ior__ exposed via AsNumber as wrapper_descriptor
     fn __ior__(self, other: PyObjectRef, vm: &VirtualMachine) -> PyResult<Self> {
         self.merge_object(other, vm)?;
         Ok(self)
     }
 
-    #[pymethod]
+    // __ror__ exposed via AsNumber as wrapper_descriptor
     fn __ror__(self, other: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         let other_dict: Result<Self, _> = other.downcast();
         if let Ok(other) = other_dict {
@@ -1143,7 +1143,7 @@ impl ViewSetOps for PyDictKeys {}
     )
 )]
 impl PyDictKeys {
-    #[pymethod]
+    // __contains__ exposed via AsSequence as wrapper_descriptor
     fn __contains__(zelf: PyObjectRef, key: PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
         zelf.sequence_unchecked().contains(&key, vm)
     }
@@ -1208,7 +1208,7 @@ impl ViewSetOps for PyDictItems {}
     )
 )]
 impl PyDictItems {
-    #[pymethod]
+    // __contains__ exposed via AsSequence as wrapper_descriptor
     fn __contains__(zelf: PyObjectRef, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
         zelf.sequence_unchecked().contains(&needle, vm)
     }

crates/vm/src/builtins/genericalias.rs

@@ -189,7 +189,7 @@ impl PyGenericAlias {
         }
     }
 
-    #[pymethod]
+    // Exposed via AsMapping.subscript slot
     fn __getitem__(zelf: PyRef<Self>, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         let new_args = subs_parameters(
             zelf.to_owned().into(),
@@ -236,12 +236,12 @@ impl PyGenericAlias {
         Err(vm.new_type_error("issubclass() argument 2 cannot be a parameterized generic"))
     }
 
-    #[pymethod]
+    // Exposed via AsNumber.or slot (right variant)
     fn __ror__(zelf: PyObjectRef, other: PyObjectRef, vm: &VirtualMachine) -> PyObjectRef {
         type_::or_(other, zelf, vm)
     }
 
-    #[pymethod]
+    // Exposed via AsNumber.or slot
     fn __or__(zelf: PyObjectRef, other: PyObjectRef, vm: &VirtualMachine) -> PyObjectRef {
         type_::or_(zelf, other, vm)
     }

crates/vm/src/builtins/getset.rs

@@ -118,7 +118,7 @@ impl PyGetSet {
             )))
         }
     }
-    #[pymethod]
+    // Exposed via slots.descr_set slot
     fn __set__(
         zelf: PyObjectRef,
         obj: PyObjectRef,
@@ -127,7 +127,7 @@ impl PyGetSet {
     ) -> PyResult<()> {
         Self::descr_set(&zelf, obj, PySetterValue::Assign(value), vm)
     }
-    #[pymethod]
+    // Exposed via slots.descr_set slot (delete variant)
     fn __delete__(zelf: PyObjectRef, obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
         Self::descr_set(&zelf, obj, PySetterValue::Delete, vm)
     }

crates/vm/src/builtins/list.rs

@@ -144,7 +144,7 @@ impl PyList {
         Ok(Self::from(elements).into_ref(&vm.ctx))
     }
 
-    #[pymethod]
+    // __add__ exposed via AsSequence as wrapper_descriptor
     fn __add__(&self, other: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
         self.concat(&other, vm)
     }
@@ -159,7 +159,7 @@ impl PyList {
         Ok(zelf.to_owned().into())
     }
 
-    #[pymethod]
+    // __iadd__ exposed via AsSequence as wrapper_descriptor
     fn __iadd__(
         zelf: PyRef<Self>,
         other: PyObjectRef,
@@ -180,8 +180,8 @@ impl PyList {
         Self::from(self.borrow_vec().to_vec()).into_ref(&vm.ctx)
     }
 
+    // __len__ exposed via AsSequence as wrapper_descriptor
     #[allow(clippy::len_without_is_empty)]
-    #[pymethod]
     pub fn __len__(&self) -> usize {
         self.borrow_vec().len()
     }
@@ -215,7 +215,7 @@ impl PyList {
         }
     }
 
-    #[pymethod]
+    // __getitem__ exposed via AsMapping as wrapper_descriptor
     fn __getitem__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         self._getitem(&needle, vm)
     }
@@ -230,7 +230,7 @@ impl PyList {
         }
     }
 
-    #[pymethod]
+    // __setitem__ exposed via AsMapping as wrapper_descriptor
     fn __setitem__(
         &self,
         needle: PyObjectRef,
@@ -240,13 +240,12 @@ impl PyList {
         self._setitem(&needle, value, vm)
     }
 
-    #[pymethod]
-    #[pymethod(name = "__rmul__")]
+    // __mul__ and __rmul__ exposed via AsSequence as wrapper_descriptor
     fn __mul__(&self, n: ArgSize, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
         self.repeat(n.into(), vm)
     }
 
-    #[pymethod]
+    // __imul__ exposed via AsSequence as wrapper_descriptor
     fn __imul__(zelf: PyRef<Self>, n: ArgSize, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
         Self::irepeat(zelf, n.into(), vm)
     }
@@ -256,7 +255,7 @@ impl PyList {
         self.mut_count(vm, &needle)
     }
 
-    #[pymethod]
+    // __contains__ exposed via AsSequence as wrapper_descriptor
     pub(crate) fn __contains__(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
         self.mut_contains(vm, &needle)
     }
@@ -314,7 +313,7 @@ impl PyList {
         }
     }
 
-    #[pymethod]
+    // __delitem__ exposed via AsMapping as wrapper_descriptor
     fn __delitem__(&self, subscript: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
         self._delitem(&subscript, vm)
     }