File tree Expand file tree Collapse file tree 4 files changed +8
-8
lines changed Expand file tree Collapse file tree 4 files changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -910,9 +910,10 @@ fn call_object_format(
910
910
911
911
let result = vm. call_method ( & argument, "__format__" , vec ! [ returned_type] ) ?;
912
912
if !objtype:: isinstance ( & result, & vm. ctx . types . str_type ) {
913
- let result_type = result. class ( ) ;
914
- let actual_type = vm. to_pystr ( & result_type) ?;
915
- return Err ( vm. new_type_error ( format ! ( "__format__ must return a str, not {}" , actual_type) ) ) ;
913
+ return Err ( vm. new_type_error ( format ! (
914
+ "__format__ must return a str, not {}" ,
915
+ & result. class( ) . name
916
+ ) ) ) ;
916
917
}
917
918
Ok ( result)
918
919
}
Original file line number Diff line number Diff line change @@ -128,8 +128,8 @@ impl PyFuncArgs {
128
128
if isinstance ( & kwarg, & ty) {
129
129
Ok ( Some ( kwarg) )
130
130
} else {
131
- let expected_ty_name = vm . to_pystr ( & ty) ? ;
132
- let actual_ty_name = vm . to_pystr ( & kwarg. class ( ) ) ? ;
131
+ let expected_ty_name = & ty. name ;
132
+ let actual_ty_name = & kwarg. class ( ) . name ;
133
133
Err ( vm. new_type_error ( format ! (
134
134
"argument of type {} is required for named parameter `{}` (got: {})" ,
135
135
expected_ty_name, key, actual_ty_name
Original file line number Diff line number Diff line change @@ -155,8 +155,7 @@ impl PyBool {
155
155
#[ pyslot]
156
156
fn tp_new ( zelf : PyObjectRef , x : OptionalArg < PyObjectRef > , vm : & VirtualMachine ) -> PyResult {
157
157
if !objtype:: isinstance ( & zelf, & vm. ctx . types . type_type ) {
158
- let zelf_typ = zelf. class ( ) ;
159
- let actual_type = vm. to_pystr ( & zelf_typ) ?;
158
+ let actual_type = & zelf. class ( ) . name ;
160
159
return Err ( vm. new_type_error ( format ! (
161
160
"requires a 'type' object but received a '{}'" ,
162
161
actual_type
Original file line number Diff line number Diff line change @@ -194,7 +194,7 @@ impl PyBaseObject {
194
194
Ok ( ( ) )
195
195
}
196
196
Err ( value) => {
197
- let type_repr = vm . to_pystr ( & value. class ( ) ) ? ;
197
+ let type_repr = & value. class ( ) . name ;
198
198
Err ( vm. new_type_error ( format ! (
199
199
"__class__ must be set to a class, not '{}' object" ,
200
200
type_repr
You can’t perform that action at this time.
0 commit comments