Add type_check to _check()

vm/src/builtins/getset.rs

@@ -51,18 +51,19 @@ impl GetDescriptor for PyGetSet {
  _cls: Option<PyObjectRef>,
  vm: &VirtualMachine,
  ) -> PyResult {
- let (zelf, obj) = match Self::_check(&zelf, obj, vm) {
- Some(obj) => obj,
- None => return Ok(zelf),
- };
- if let Some(ref f) = zelf.getter {
- f(vm, obj)
+ if let Some(obj) = obj {
+ let (zelf, obj) = Self::_check(&zelf, obj, vm)?;
+ if let Some(ref f) = zelf.getter {
+ f(vm, obj)
+ } else {
+ Err(vm.new_attribute_error(format!(
+ "attribute '{}' of '{}' objects is not readable",
+ zelf.name,
+ Self::class(&vm.ctx).name()
+ )))
+ }
  } else {
- Err(vm.new_attribute_error(format!(
- "attribute '{}' of '{}' objects is not readable",
- zelf.name,
- Self::class(&vm.ctx).name()
- )))
+ Ok(zelf)
  }
  }
 }

vm/src/protocol/object.rs

@@ -559,13 +559,13 @@ impl PyObject {
 
  // type protocol
  // PyObject *PyObject_Type(PyObject *o)
- pub fn obj_type(&self) -> PyObjectRef {
- self.class().to_owned().into()
+ pub fn obj_type(&self) -> PyTypeRef {
+ self.class().to_owned()
  }
 
  // int PyObject_TypeCheck(PyObject *o, PyTypeObject *type)
  pub fn type_check(&self, typ: PyTypeRef) -> bool {
- self.class().fast_isinstance(&typ)
+ self.fast_isinstance(&typ)
  }
 
  pub fn length_opt(&self, vm: &VirtualMachine) -> Option<PyResult<usize>> {

vm/src/types/slot.rs

@@ -893,22 +893,20 @@ pub trait GetDescriptor: PyPayload {
  #[inline]
  fn _check<'a>(
  zelf: &'a PyObject,
- obj: Option<PyObjectRef>,
+ obj: PyObjectRef,
  vm: &VirtualMachine,
- ) -> Option<(&'a Py<Self>, PyObjectRef)> {
+ ) -> PyResult<(&'a Py<Self>, PyObjectRef)> {
  // CPython descr_check
- let obj = obj?;
- // if (!PyObject_TypeCheck(obj, descr->d_type)) {
- // PyErr_Format(PyExc_TypeError,
- // "descriptor '%V' for '%.100s' objects "
- // "doesn't apply to a '%.100s' object",
- // descr_name((PyDescrObject *)descr), "?",
- // descr->d_type->slot_name,
- // obj->ob_type->slot_name);
- // *pres = NULL;
- // return 1;
- // } else {
- Some((Self::_as_pyref(zelf, vm).unwrap(), obj))
+ if !obj.type_check(zelf.obj_type()) {
+ Err(vm.new_type_error(format!(
+ "descriptor {:?} for {} objects doesn't apply to a {} object",
+ zelf,
+ zelf.obj_type(),
+ obj.obj_type()
+ )))
+ } else {
+ Ok((Self::_as_pyref(zelf, vm).unwrap(), obj))
+ }
  }
 
  #[inline]