Merge pull request RustPython#2275 from youknowone/lease-class

more lease_class

Author: youknowone

vm/src/bytesinner.rs

@@ -139,7 +139,7 @@ impl ByteInnerNewOptions {
                                     // .map_err(|_| {
                                     //     vm.new_type_error(format!(
                                     //         "cannot convert '{}' object to bytes",
-                                    //         obj.class().name
+                                    //         obj.lease_class().name
                                     //     ))
                                     // })?;
                                 }

vm/src/obj/objbuiltinfunc.rs

@@ -183,7 +183,7 @@ impl SlotDescriptor for PyBuiltinMethod {
             Ok(obj) => obj,
             Err(result) => return result,
         };
-        if vm.is_none(&obj) && !Self::_cls_is(&cls, &obj.class()) {
+        if vm.is_none(&obj) && !Self::_cls_is(&cls, &obj.lease_class()) {
             Ok(zelf.into_object())
         } else {
             Ok(vm.ctx.new_bound_method(zelf.into_object(), obj))

vm/src/obj/objfunction.rs

@@ -312,7 +312,7 @@ impl SlotDescriptor for PyFunction {
         vm: &VirtualMachine,
     ) -> PyResult {
         let (zelf, obj) = Self::_unwrap(zelf, obj, vm)?;
-        if vm.is_none(&obj) && !Self::_cls_is(&cls, &obj.class()) {
+        if vm.is_none(&obj) && !Self::_cls_is(&cls, &obj.lease_class()) {
             Ok(zelf.into_object())
         } else {
             Ok(vm.ctx.new_bound_method(zelf.into_object(), obj))

vm/src/obj/objint.rs

@@ -737,7 +737,7 @@ pub(crate) fn to_int(vm: &VirtualMachine, obj: &PyObjectRef) -> PyResult<BigInt>
             Some(int_obj) => Ok(int_obj.borrow_value().clone()),
             None => Err(vm.new_type_error(format!(
                 "__int__ returned non-int (type '{}')",
-                result.class().name
+                result.lease_class().name
             ))),
         };
     }
@@ -748,7 +748,7 @@ pub(crate) fn to_int(vm: &VirtualMachine, obj: &PyObjectRef) -> PyResult<BigInt>
 
     Err(vm.new_type_error(format!(
         "int() argument must be a string, a bytes-like object or a number, not '{}'",
-        obj.class().name
+        obj.lease_class().name
     )))
 }
 

vm/src/obj/objmemory.rs

@@ -752,8 +752,8 @@ impl Comparable for PyMemoryView {
             _ => Err(vm.new_type_error(format!(
                 "'{}' not supported between instances of '{}' and '{}'",
                 op.operator_token(),
-                zelf.class().name,
-                other.class().name
+                zelf.lease_class().name,
+                other.lease_class().name
             ))),
         }
     }
@@ -776,7 +776,7 @@ pub(crate) fn init(ctx: &PyContext) {
 }
 
 pub fn try_buffer_from_object(vm: &VirtualMachine, obj: &PyObjectRef) -> PyResult<BufferRef> {
-    let obj_cls = obj.class();
+    let obj_cls = obj.lease_class();
     for cls in obj_cls.iter_mro() {
         if let Some(f) = cls.slots.buffer.as_ref() {
             return f(obj, vm).map(|x| BufferRef(x));

vm/src/obj/objobject.rs

@@ -185,7 +185,7 @@ impl PyBaseObject {
 
     #[pymethod(magic)]
     pub fn dir(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyList> {
-        let attributes: PyAttributes = obj.class().get_attributes();
+        let attributes: PyAttributes = obj.lease_class().get_attributes();
 
         let dict = PyDict::from_attributes(attributes, vm)?.into_ref(vm);
 

vm/src/obj/objtuple.rs

@@ -77,7 +77,7 @@ impl PyTuple {
             let py_int = PyIntRef::try_from_object(vm, elem.clone()).map_err(|_| {
                 vm.new_type_error(format!(
                     "'{}' object cannot be interpreted as an integer",
-                    elem.class().name
+                    elem.lease_class().name
                 ))
             })?;
             let result = py_int

vm/src/slots.rs

@@ -183,7 +183,7 @@ pub trait SlotDescriptor: PyValue {
     where
         T: IdProtocol,
     {
-        cls.as_ref().map_or(false, |cls| cls.is(other))
+        cls.as_ref().map_or(false, |cls| other.is(cls))
     }
 }
 

vm/src/stdlib/math.rs

@@ -139,7 +139,7 @@ fn math_isqrt(x: PyObjectRef, vm: &VirtualMachine) -> PyResult<BigInt> {
     let index = vm.to_index(&x).ok_or_else(|| {
         vm.new_type_error(format!(
             "'{}' object cannot be interpreted as an integer",
-            x.class().name
+            x.lease_class().name
         ))
     })?;
     // __index__ may have returned non-int type