Merge pull request RustPython#657 from skinny121/attribute_error

OddCoincidence · web-flow · commit dfb24d7f11ad · 2019-03-10T22:13:38.000-07:00
Use new_attribute_error in more places
diff --git a/vm/src/obj/objfunction.rs b/vm/src/obj/objfunction.rs
@@ -129,13 +129,9 @@ fn classmethod_get(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
             let py_method = vm.ctx.new_bound_method(function, py_obj);
             Ok(py_method)
         }
-        None => {
-            let attribute_error = vm.context().exceptions.attribute_error.clone();
-            Err(vm.new_exception(
-                attribute_error,
-                String::from("Attribute Error: classmethod must have 'function' attribute"),
-            ))
-        }
+        None => Err(vm.new_attribute_error(
+            "Attribute Error: classmethod must have 'function' attribute".to_string(),
+        )),
     }
 }
 
@@ -162,13 +158,9 @@ fn staticmethod_get(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     );
     match cls.get_attr("function") {
         Some(function) => Ok(function),
-        None => {
-            let attribute_error = vm.context().exceptions.attribute_error.clone();
-            Err(vm.new_exception(
-                attribute_error,
-                String::from("Attribute Error: staticmethod must have 'function' attribute"),
-            ))
-        }
+        None => Err(vm.new_attribute_error(
+            "Attribute Error: staticmethod must have 'function' attribute".to_string(),
+        )),
     }
 }
 
diff --git a/vm/src/obj/objobject.rs b/vm/src/obj/objobject.rs
@@ -256,11 +256,7 @@ fn object_getattribute(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     } else if let Some(getter) = cls.get_attr("__getattr__") {
         vm.invoke(getter, vec![cls, name_str.clone()])
     } else {
-        let attribute_error = vm.context().exceptions.attribute_error.clone();
-        Err(vm.new_exception(
-            attribute_error,
-            format!("{} has no attribute '{}'", obj, name),
-        ))
+        Err(vm.new_attribute_error(format!("{} has no attribute '{}'", obj, name)))
     }
 }
 
diff --git a/vm/src/obj/objtype.rs b/vm/src/obj/objtype.rs
@@ -225,11 +225,7 @@ pub fn type_getattribute(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult
     } else if let Some(getter) = cls.get_attr("__getattr__") {
         vm.invoke(getter, vec![mcl, name_str.clone()])
     } else {
-        let attribute_error = vm.context().exceptions.attribute_error.clone();
-        Err(vm.new_exception(
-            attribute_error,
-            format!("{} has no attribute '{}'", cls, name),
-        ))
+        Err(vm.new_attribute_error(format!("{} has no attribute '{}'", cls, name)))
     }
 }
 
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -137,8 +137,8 @@ impl VirtualMachine {
     }
 
     pub fn new_attribute_error(&mut self, msg: String) -> PyObjectRef {
-        let type_error = self.ctx.exceptions.attribute_error.clone();
-        self.new_exception(type_error, msg)
+        let attribute_error = self.ctx.exceptions.attribute_error.clone();
+        self.new_exception(attribute_error, msg)
     }
 
     pub fn new_type_error(&mut self, msg: String) -> PyObjectRef {

Original file line number	Diff line number	Diff line change
`@@ -256,11 +256,7 @@ fn object_getattribute(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
`256`	`256`	`} else if let Some(getter) = cls.get_attr("__getattr__") {`
`257`	`257`	`vm.invoke(getter, vec![cls, name_str.clone()])`
`258`	`258`	`} else {`
`259`		`- let attribute_error = vm.context().exceptions.attribute_error.clone();`
`260`		`- Err(vm.new_exception(`
`261`		`- attribute_error,`
`262`		`- format!("{} has no attribute '{}'", obj, name),`
`263`		`- ))`
	`259`	`+ Err(vm.new_attribute_error(format!("{} has no attribute '{}'", obj, name)))`
`264`	`260`	`}`
`265`	`261`	`}`
`266`	`262`
Original file line number	Diff line number	Diff line change
`@@ -225,11 +225,7 @@ pub fn type_getattribute(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult`
`225`	`225`	`} else if let Some(getter) = cls.get_attr("__getattr__") {`
`226`	`226`	`vm.invoke(getter, vec![mcl, name_str.clone()])`
`227`	`227`	`} else {`
`228`		`- let attribute_error = vm.context().exceptions.attribute_error.clone();`
`229`		`- Err(vm.new_exception(`
`230`		`- attribute_error,`
`231`		`- format!("{} has no attribute '{}'", cls, name),`
`232`		`- ))`
	`228`	`+ Err(vm.new_attribute_error(format!("{} has no attribute '{}'", cls, name)))`
`233`	`229`	`}`
`234`	`230`	`}`
`235`	`231`
Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,8 @@ impl VirtualMachine {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`pub fn new_attribute_error(&mut self, msg: String) -> PyObjectRef {`
`140`		`- let type_error = self.ctx.exceptions.attribute_error.clone();`
`141`		`- self.new_exception(type_error, msg)`
	`140`	`+ let attribute_error = self.ctx.exceptions.attribute_error.clone();`
	`141`	`+ self.new_exception(attribute_error, msg)`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`pub fn new_type_error(&mut self, msg: String) -> PyObjectRef {`