From e35dec64f9410bfc06115b2bb1bae42cb498a97d Mon Sep 17 00:00:00 2001 From: Yonatan Goldschmidt Date: Mon, 6 May 2019 21:47:18 +0300 Subject: [PATCH] Add `vm.new_name_error` helper --- vm/src/frame.rs | 5 +---- vm/src/vm.rs | 5 +++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/vm/src/frame.rs b/vm/src/frame.rs index ddddad91e..ae9958969 100644 --- a/vm/src/frame.rs +++ b/vm/src/frame.rs @@ -1090,10 +1090,7 @@ impl Frame { let value = match optional_value { Some(value) => value, None => { - let name_error_type = vm.ctx.exceptions.name_error.clone(); - let msg = format!("name '{}' is not defined", name); - let name_error = vm.new_exception(name_error_type, msg); - return Err(name_error); + return Err(vm.new_name_error(format!("name '{}' is not defined", name))); } }; diff --git a/vm/src/vm.rs b/vm/src/vm.rs index 48bec9302..6b2f0e0b1 100644 --- a/vm/src/vm.rs +++ b/vm/src/vm.rs @@ -186,6 +186,11 @@ impl VirtualMachine { self.new_exception(type_error, msg) } + pub fn new_name_error(&self, msg: String) -> PyObjectRef { + let name_error = self.ctx.exceptions.name_error.clone(); + self.new_exception(name_error, msg) + } + pub fn new_unsupported_operand_error( &self, a: PyObjectRef,