Commit 3bf9bf0

committed

Fix compilation issue when compiled with pym feature

1 parent d80ccc8 commit 3bf9bf0Copy full SHA for 3bf9bf0

File tree

+11

-6

lines changed

+11

-6

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,8 @@ impl std::convert::From<openssl::error::ErrorStack> for Error {`
`137`	`137`	`// pyo3`
`138`	`138`	`#[cfg(feature = "pym")]`
`139`	`139`	`impl std::convert::From<pyo3::PyErr> for Error {`
`140`		`- fn from(_: pyo3::PyErr) -> Self {`
`141`		`- Error::ScriptError("Python script went Error".to_string())`
	`140`	`+ fn from(x: pyo3::PyErr) -> Self {`
	`141`	`+ // Error::ScriptError("Python script went Error".to_string())`
	`142`	`+ Error::ScriptError(x.to_string())`
`142`	`143`	`}`
`143`	`144`	`}`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,17 +10,21 @@ pub fn exec(module: &str) -> Result<Vec<String>, crate::Error> {`
`10`	`10`	`let script = load_script(&module)?;`
`11`	`11`	`let cache = Cache::new()?;`
`12`	`12`
	`13`	`+ pyo3::prepare_freethreaded_python();`
`13`	`14`	`// pygil`
`14`		`- let gil = Python::acquire_gil();`
`15`		`- let py = gil.python();`
`16`		`- let pym = PyModule::from_code(py,&script,"plan.py","plan")?;`
	`15`	`+ Python::with_gil(\|py\| {`
	`16`	`+ let fun_plan = PyModule::from_code(py,&script,`
	`17`	`+ "plan_script.py","plan_script")?.getattr("plan")?;`
`17`	`18`
`18`	`19`	`// args`
`19`	`20`	`let sps = serde_json::to_string(&cache.get_problems()?)?;`
`20`	`21`	`let stags = serde_json::to_string(&cache.get_tags()?)?;`
	`22`	`+ let args = (sps, stags);`
`21`	`23`
`22`	`24`	`// ret`
`23`		`- let res: Vec<String> = pym.call1("plan", (sps, stags))?.extract()?;`
	`25`	`+ let res: Vec<String> = fun_plan.call1(args)?.extract()?;`
	`26`	`+ // let res: Vec<String> = pym.call1((sps, stags))?.extract()?;`
`24`	`27`
`25`	`28`	`Ok(res)`
	`29`	`+ })`
`26`	`30`	`}`

Comments

(0)