From d0f13f327bfcd8b1bb9337d608480baa254dd5ab Mon Sep 17 00:00:00 2001 From: ChJR Date: Wed, 20 Oct 2021 02:15:44 +0900 Subject: [PATCH] Relocate vm.isinstance to obj.is_instance --- vm/src/frame.rs | 2 +- vm/src/stdlib/builtins.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vm/src/frame.rs b/vm/src/frame.rs index 24a2885ee..bad945dde 100644 --- a/vm/src/frame.rs +++ b/vm/src/frame.rs @@ -1783,7 +1783,7 @@ impl ExecutingFrame<'_> { bytecode::ComparisonOperator::In => vm.ctx.new_bool(self._in(vm, a, b)?).into(), bytecode::ComparisonOperator::NotIn => vm.ctx.new_bool(self._not_in(vm, a, b)?).into(), bytecode::ComparisonOperator::ExceptionMatch => { - vm.ctx.new_bool(vm.isinstance(&a, &b)?).into() + vm.ctx.new_bool(a.is_instance(&b, vm)?).into() } }; diff --git a/vm/src/stdlib/builtins.rs b/vm/src/stdlib/builtins.rs index 763f272d1..aea245b91 100644 --- a/vm/src/stdlib/builtins.rs +++ b/vm/src/stdlib/builtins.rs @@ -397,7 +397,7 @@ mod builtins { #[pyfunction] fn isinstance(obj: PyObjectRef, typ: PyObjectRef, vm: &VirtualMachine) -> PyResult { - vm.isinstance(&obj, &typ) + obj.is_instance(&typ, vm) } #[pyfunction]