@@ -10,7 +10,7 @@ use num_traits::ToPrimitive;
1010
1111use crate :: byteslike:: PyBytesLike ;
1212use crate :: common:: cell:: { PyRwLock , PyRwLockWriteGuard } ;
13- use crate :: exceptions:: PyBaseExceptionRef ;
13+ use crate :: exceptions:: { IntoPyException , PyBaseExceptionRef } ;
1414use crate :: function:: { Args , KwArgs , OptionalArg , OptionalOption , PyFuncArgs } ;
1515use crate :: obj:: objbool;
1616use crate :: obj:: objbytearray:: PyByteArray ;
@@ -53,7 +53,7 @@ impl OptionalSize {
5353fn os_err ( vm : & VirtualMachine , err : io:: Error ) -> PyBaseExceptionRef {
5454 #[ cfg( any( not( target_arch = "wasm32" ) , target_os = "wasi" ) ) ]
5555 {
56- super :: os :: convert_io_error ( vm, err )
56+ err . into_pyexception ( vm)
5757 }
5858 #[ cfg( all( target_arch = "wasm32" , not( target_os = "wasi" ) ) ) ]
5959 {
@@ -718,14 +718,14 @@ mod fileio {
718718 let mut bytes = vec ! [ 0 ; read_byte as usize ] ;
719719 let n = handle
720720 . read ( & mut bytes)
721- . map_err ( |e| os :: convert_io_error ( vm, e ) ) ?;
721+ . map_err ( |err| err . into_pyexception ( vm) ) ?;
722722 bytes. truncate ( n) ;
723723 bytes
724724 } else {
725725 let mut bytes = vec ! [ ] ;
726726 handle
727727 . read_to_end ( & mut bytes)
728- . map_err ( |e| os :: convert_io_error ( vm, e ) ) ?;
728+ . map_err ( |err| err . into_pyexception ( vm) ) ?;
729729 bytes
730730 } ;
731731 fio_set_fileno ( & instance, handle, vm) ?;
@@ -776,7 +776,7 @@ mod fileio {
776776
777777 let len = obj
778778 . with_ref ( |b| handle. write ( b) )
779- . map_err ( |e| os :: convert_io_error ( vm, e ) ) ?;
779+ . map_err ( |err| err . into_pyexception ( vm) ) ?;
780780
781781 fio_set_fileno ( & instance, handle, vm) ?;
782782
@@ -809,7 +809,7 @@ mod fileio {
809809
810810 let new_pos = handle
811811 . seek ( seekfrom ( vm, offset, how) ?)
812- . map_err ( |e| os :: convert_io_error ( vm, e ) ) ?;
812+ . map_err ( |err| err . into_pyexception ( vm) ) ?;
813813
814814 fio_set_fileno ( & instance, handle, vm) ?;
815815
@@ -821,7 +821,7 @@ mod fileio {
821821
822822 let pos = handle
823823 . seek ( SeekFrom :: Current ( 0 ) )
824- . map_err ( |e| os :: convert_io_error ( vm, e ) ) ?;
824+ . map_err ( |err| err . into_pyexception ( vm) ) ?;
825825
826826 fio_set_fileno ( & instance, handle, vm) ?;
827827
0 commit comments