Use PyStrRef to extract String.

DimitrisJim · DimitrisJim · commit 6cd8644de841 · 2021-07-15T16:08:55.000+03:00
diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs
@@ -1696,12 +1696,7 @@ mod _os {
         fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {
             match obj.downcast::<int::PyInt>() {
                 Ok(int) => int::try_to_primitive(int.as_bigint(), vm).map(Self::Val),
-                Err(obj) => {
-                    let cstring = std::ffi::CString::try_from_object(vm, obj)?;
-                    cstring.into_string().map(Self::Name).map_err(|e| {
-                        vm.new_os_error(format!("error while parsing string: {:?}", e))
-                    })
-                }
+                Err(obj) => PyStrRef::try_from_object(vm, obj).map(|o| Self::Name(o.to_string())),
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1696,12 +1696,7 @@ mod _os {`
`1696`	`1696`	`fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {`
`1697`	`1697`	`match obj.downcast::<int::PyInt>() {`
`1698`	`1698`	`Ok(int) => int::try_to_primitive(int.as_bigint(), vm).map(Self::Val),`
`1699`		`- Err(obj) => {`
`1700`		`- let cstring = std::ffi::CString::try_from_object(vm, obj)?;`
`1701`		`- cstring.into_string().map(Self::Name).map_err(\|e\| {`
`1702`		`- vm.new_os_error(format!("error while parsing string: {:?}", e))`
`1703`		`- })`
`1704`		`- }`
	`1699`	`+ Err(obj) => PyStrRef::try_from_object(vm, obj).map(\|o\| Self::Name(o.to_string())),`
`1705`	`1700`	`}`
`1706`	`1701`	`}`
`1707`	`1702`	`}`