Add _io.open_code

coolreader18 · coolreader18 · commit 10c63dacbd88 · 2020-05-03T16:09:25.000-05:00
diff --git a/vm/src/stdlib/io.rs b/vm/src/stdlib/io.rs
@@ -785,6 +785,22 @@ fn text_io_wrapper_seekable(_self: PyObjectRef) -> bool {
     true
 }
 
+fn text_io_wrapper_seek(
+    instance: PyObjectRef,
+    offset: PyObjectRef,
+    how: OptionalArg,
+    vm: &VirtualMachine,
+) -> PyResult {
+    let raw = vm.get_attribute(instance, "buffer")?;
+    let args: Vec<_> = std::iter::once(offset).chain(how.into_option()).collect();
+    vm.invoke(&vm.get_attribute(raw, "seek")?, args)
+}
+
+fn text_io_wrapper_tell(instance: PyObjectRef, vm: &VirtualMachine) -> PyResult {
+    let raw = vm.get_attribute(instance, "buffer")?;
+    vm.invoke(&vm.get_attribute(raw, "tell")?, vec![])
+}
+
 fn text_io_wrapper_read(
     instance: PyObjectRef,
     size: OptionalOption<PyObjectRef>,
@@ -930,16 +946,21 @@ fn split_mode_string(mode_string: &str) -> Result<(String, String), String> {
     Ok((mode, typ.to_string()))
 }
 
-pub fn io_open(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult {
-    arg_check!(
-        vm,
-        args,
-        required = [(file, None)],
-        optional = [(mode, Some(vm.ctx.str_type()))]
-    );
+fn io_open_wrapper(
+    file: PyObjectRef,
+    mode: OptionalArg<PyStringRef>,
+    vm: &VirtualMachine,
+) -> PyResult {
+    io_open(file, mode.as_ref().into_option().map(|s| s.as_str()), vm)
+}
+fn io_open_code(file: PyObjectRef, vm: &VirtualMachine) -> PyResult {
+    // TODO: lifecycle hooks or something?
+    io_open(file, Some("rb"), vm)
+}
 
+pub fn io_open(file: PyObjectRef, mode: Option<&str>, vm: &VirtualMachine) -> PyResult {
     // mode is optional: 'rt' is the default mode (open from reading text)
-    let mode_string = mode.map_or("rt", objstr::borrow_value);
+    let mode_string = mode.unwrap_or("rt");
 
     let (mode, typ) = match split_mode_string(mode_string) {
         Ok((mode, typ)) => (mode, typ),
@@ -1061,6 +1082,8 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
     let text_io_wrapper = py_class!(ctx, "TextIOWrapper", text_io_base.clone(), {
         "__init__" => ctx.new_method(text_io_wrapper_init),
         "seekable" => ctx.new_method(text_io_wrapper_seekable),
+        "seek" => ctx.new_method(text_io_wrapper_seek),
+        "tell" => ctx.new_method(text_io_wrapper_tell),
         "read" => ctx.new_method(text_io_wrapper_read),
         "write" => ctx.new_method(text_io_wrapper_write),
         "readline" => ctx.new_method(text_io_wrapper_readline),
@@ -1098,7 +1121,8 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
     });
 
     let module = py_module!(vm, "_io", {
-        "open" => ctx.new_function(io_open),
+        "open" => ctx.new_function(io_open_wrapper),
+        "open_code" => ctx.new_function(io_open_code),
         "_IOBase" => io_base,
         "_RawIOBase" => raw_io_base.clone(),
         "_BufferedIOBase" => buffered_io_base,
diff --git a/vm/src/stdlib/subprocess.rs b/vm/src/stdlib/subprocess.rs
@@ -90,15 +90,12 @@ fn convert_redirection(arg: Option<i64>, vm: &VirtualMachine) -> PyResult<subpro
     }
 }
 
-fn convert_to_file_io(file: &Option<File>, mode: String, vm: &VirtualMachine) -> PyResult {
+fn convert_to_file_io(file: &Option<File>, mode: &str, vm: &VirtualMachine) -> PyResult {
     match file {
         Some(ref stdin) => io_open(
+            vm.new_int(raw_file_number(stdin.try_clone().unwrap())),
+            Some(mode),
             vm,
-            vec![
-                vm.new_int(raw_file_number(stdin.try_clone().unwrap())),
-                vm.new_str(mode),
-            ]
-            .into(),
         ),
         None => Ok(vm.get_none()),
     }
@@ -169,15 +166,15 @@ impl PopenRef {
     }
 
     fn stdin(self, vm: &VirtualMachine) -> PyResult {
-        convert_to_file_io(&self.process.borrow().stdin, "wb".to_owned(), vm)
+        convert_to_file_io(&self.process.borrow().stdin, "wb", vm)
     }
 
     fn stdout(self, vm: &VirtualMachine) -> PyResult {
-        convert_to_file_io(&self.process.borrow().stdout, "rb".to_owned(), vm)
+        convert_to_file_io(&self.process.borrow().stdout, "rb", vm)
     }
 
     fn stderr(self, vm: &VirtualMachine) -> PyResult {
-        convert_to_file_io(&self.process.borrow().stderr, "rb".to_owned(), vm)
+        convert_to_file_io(&self.process.borrow().stderr, "rb", vm)
     }
 
     fn terminate(self, vm: &VirtualMachine) -> PyResult<()> {

Original file line number	Diff line number	Diff line change
`@@ -90,15 +90,12 @@ fn convert_redirection(arg: Option<i64>, vm: &VirtualMachine) -> PyResult<subpro`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`93`		`-fn convert_to_file_io(file: &Option<File>, mode: String, vm: &VirtualMachine) -> PyResult {`
	`93`	`+fn convert_to_file_io(file: &Option<File>, mode: &str, vm: &VirtualMachine) -> PyResult {`
`94`	`94`	`match file {`
`95`	`95`	`Some(ref stdin) => io_open(`
	`96`	`+ vm.new_int(raw_file_number(stdin.try_clone().unwrap())),`
	`97`	`+ Some(mode),`
`96`	`98`	`vm,`
`97`		`- vec![`
`98`		`- vm.new_int(raw_file_number(stdin.try_clone().unwrap())),`
`99`		`- vm.new_str(mode),`
`100`		`- ]`
`101`		`- .into(),`
`102`	`99`	`),`
`103`	`100`	`None => Ok(vm.get_none()),`
`104`	`101`	`}`
`@@ -169,15 +166,15 @@ impl PopenRef {`
`169`	`166`	`}`
`170`	`167`
`171`	`168`	`fn stdin(self, vm: &VirtualMachine) -> PyResult {`
`172`		`- convert_to_file_io(&self.process.borrow().stdin, "wb".to_owned(), vm)`
	`169`	`+ convert_to_file_io(&self.process.borrow().stdin, "wb", vm)`
`173`	`170`	`}`
`174`	`171`
`175`	`172`	`fn stdout(self, vm: &VirtualMachine) -> PyResult {`
`176`		`- convert_to_file_io(&self.process.borrow().stdout, "rb".to_owned(), vm)`
	`173`	`+ convert_to_file_io(&self.process.borrow().stdout, "rb", vm)`
`177`	`174`	`}`
`178`	`175`
`179`	`176`	`fn stderr(self, vm: &VirtualMachine) -> PyResult {`
`180`		`- convert_to_file_io(&self.process.borrow().stderr, "rb".to_owned(), vm)`
	`177`	`+ convert_to_file_io(&self.process.borrow().stderr, "rb", vm)`
`181`	`178`	`}`
`182`	`179`
`183`	`180`	`fn terminate(self, vm: &VirtualMachine) -> PyResult<()> {`