Merge pull request #50 from Jules-Bertholet/master

Upgrade to PyO3 0.17

Author: de-vri-es

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "inline-python"
-version = "0.8.0"
+version = "0.9.0"
 authors = [
 	"Mara Bos <[email protected]>",
 	"Maarten de Vries <[email protected]>",
@@ -13,8 +13,8 @@ keywords = ["python", "inline", "embed", "macro"]
 autoexamples = false
 
 [dependencies]
-inline-python-macros = { version = "=0.8.0", path = "./macros" }
-pyo3 = { version = "0.15.0", default-features = false, features = ["auto-initialize"] }
+inline-python-macros = { version = "=0.9.0", path = "./macros" }
+pyo3 = { version = "0.17.0", default-features = false, features = ["auto-initialize"] }
 
 [workspace]
 members = ["examples", "ct-python"]

ct-python/Cargo.toml

@@ -9,4 +9,4 @@ repository = "https://github.com/fusion-engineering/inline-python/tree/master/ct
 keywords = ["python", "macro", "generate", "compile-time"]
 
 [dependencies]
-inline-python-macros = { version = "=0.8.0", path = "../macros" }
+inline-python-macros = { version = "=0.9.0", path = "../macros" }

examples/Cargo.toml

@@ -17,4 +17,4 @@ path = "rust-fn.rs"
 
 [dependencies]
 inline-python = { path = ".." }
-pyo3 = "0.15.0"
+pyo3 = "0.17.0"

macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "inline-python-macros"
-version = "0.8.0"
+version = "0.9.0"
 authors = [
 	"Mara Bos <[email protected]>",
 	"Maarten de Vries <[email protected]>",
@@ -16,7 +16,7 @@ proc_macro = true
 [dependencies]
 proc-macro2 = { version = "1.0", features = ["span-locations"] }
 quote = "1.0"
-pyo3 = { version = "0.15.0", default-features = false, features = ["auto-initialize"] }
+pyo3 = { version = "0.17.0", default-features = false, features = ["auto-initialize"] }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.71"

macros/src/error.rs

@@ -1,15 +1,14 @@
 use proc_macro::Span;
 use proc_macro2::TokenStream;
-use pyo3::type_object::PyTypeObject;
-use pyo3::{PyAny, PyErr, PyResult, Python, ToPyObject};
+use pyo3::{PyAny, PyErr, PyResult, PyTypeInfo, Python, ToPyObject};
 use quote::{quote, quote_spanned};
 
 /// Format a nice error message for a python compilation error.
 pub fn compile_error_msg(py: Python, error: PyErr, tokens: TokenStream) -> TokenStream {
 	let value = error.to_object(py);
 
 	if value.is_none(py) {
-		let error = format!("python: {}", error.ptype(py).name().unwrap());
+		let error = format!("python: {}", error.get_type(py).name().unwrap());
 		return quote!(compile_error! {#error});
 	}
 
@@ -24,7 +23,7 @@ pub fn compile_error_msg(py: Python, error: PyErr, tokens: TokenStream) -> Token
 		}
 	}
 
-	if let Some(tb) = &error.ptraceback(py) {
+	if let Some(tb) = &error.traceback(py) {
 		if let Ok((file, line)) = get_traceback_info(tb) {
 			if file == Span::call_site().source_file().path().to_string_lossy() {
 				if let Ok(msg) = value.as_ref(py).str() {

macros/src/lib.rs

@@ -32,17 +32,17 @@ fn python_impl(input: TokenStream) -> Result<TokenStream, TokenStream> {
 	let filename = CString::new(filename).unwrap();
 
 	let bytecode = unsafe {
-		let gil = Python::acquire_gil();
-		let py = gil.python();
-
-		let code = PyObject::from_owned_ptr_or_err(py, ffi::Py_CompileString(python.as_ptr(), filename.as_ptr(), ffi::Py_file_input))
-			.map_err(|err| error::compile_error_msg(py, err, tokens))?;
-
-		Literal::byte_string(
-			PyBytes::from_owned_ptr_or_err(py, ffi::PyMarshal_WriteObjectToString(code.as_ptr(), pyo3::marshal::VERSION))
-				.map_err(|_e| quote!(compile_error! {"failed to generate python bytecode"}))?
-				.as_bytes(),
-		)
+		let result: Result<Literal, TokenStream> = Python::with_gil(|py| {
+			let code = PyObject::from_owned_ptr_or_err(py, ffi::Py_CompileString(python.as_ptr(), filename.as_ptr(), ffi::Py_file_input))
+				.map_err(|err| error::compile_error_msg(py, err, tokens))?;
+
+			Ok(Literal::byte_string(
+				PyBytes::from_owned_ptr_or_err(py, ffi::PyMarshal_WriteObjectToString(code.as_ptr(), pyo3::marshal::VERSION))
+					.map_err(|_e| quote!(compile_error! {"failed to generate python bytecode"}))?
+					.as_bytes(),
+			))
+		});
+		result?
 	};
 
 	let varname = variables.keys();
@@ -78,15 +78,14 @@ fn ct_python_impl(input: TokenStream) -> Result<TokenStream, TokenStream> {
 	let python = CString::new(python).unwrap();
 	let filename = CString::new(filename).unwrap();
 
-	let gil = Python::acquire_gil();
-	let py = gil.python();
+	Python::with_gil(|py| {
+		let code = unsafe {
+			PyObject::from_owned_ptr_or_err(py, ffi::Py_CompileString(python.as_ptr(), filename.as_ptr(), ffi::Py_file_input))
+				.map_err(|err| error::compile_error_msg(py, err, tokens.clone()))?
+		};
 
-	let code = unsafe {
-		PyObject::from_owned_ptr_or_err(py, ffi::Py_CompileString(python.as_ptr(), filename.as_ptr(), ffi::Py_file_input))
-			.map_err(|err| error::compile_error_msg(py, err, tokens.clone()))?
-	};
-
-	run::run_ct_python(py, code, tokens)
+		run::run_ct_python(py, code, tokens)
+	})
 }
 
 fn check_no_attribute(input: TokenStream) -> Result<(), TokenStream> {

src/context.rs

@@ -50,7 +50,7 @@ impl Context {
 	/// This function panics if it fails to create the context.
 	#[allow(clippy::new_without_default)]
 	pub fn new() -> Self {
-		Self::new_with_gil(Python::acquire_gil().python())
+		Python::with_gil(Self::new_with_gil)
 	}
 
 	/// Create a new context for running Python code.
@@ -86,7 +86,7 @@ impl Context {
 	///
 	/// This function panics if the variable doesn't exist, or the conversion fails.
 	pub fn get<T: for<'p> FromPyObject<'p>>(&self, name: &str) -> T {
-		self.get_with_gil(Python::acquire_gil().python(), name)
+		Python::with_gil(|py| self.get_with_gil(py, name))
 	}
 
 	/// Retrieve a global variable from the context.
@@ -112,7 +112,7 @@ impl Context {
 	///
 	/// This function panics if the conversion fails.
 	pub fn set<T: ToPyObject>(&self, name: &str, value: T) {
-		self.set_with_gil(Python::acquire_gil().python(), name, value)
+		Python::with_gil(|py| self.set_with_gil(py, name, value));
 	}
 
 	/// Set a global variable in the context.
@@ -155,7 +155,7 @@ impl Context {
 	/// This function temporarily acquires the GIL.
 	/// If you already have the GIL, you can use [`Context::add_wrapped_with_gil`] instead.
 	pub fn add_wrapped(&self, wrapper: &impl Fn(Python) -> PyResult<&PyCFunction>) {
-		self.add_wrapped_with_gil(Python::acquire_gil().python(), wrapper);
+		Python::with_gil(|py| self.add_wrapped_with_gil(py, wrapper));
 	}
 
 	/// Add a wrapped `#[pyfunction]` or `#[pymodule]` using its own `__name__`.
@@ -185,7 +185,7 @@ impl Context {
 	///
 	/// This function panics if the Python code fails.
 	pub fn run<F: FnOnce(&PyDict)>(&self, code: PythonBlock<F>) {
-		self.run_with_gil(Python::acquire_gil().python(), code);
+		Python::with_gil(|py| self.run_with_gil(py, code));
 	}
 
 	/// Run Python code using this context.

src/lib.rs

@@ -20,7 +20,7 @@
 //!
 //! _NOTE:_ Rust **nightly** toolchain is required. Feature `proc_macro_span` is still unstable,
 //! for more details check out [issue #54725](https://github.com/rust-lang/rust/issues/54725) - Tracking issue for `proc_macro::Span` inspection APIs
-//! 
+//!
 //! ## Using Rust variables
 //!
 //! To reference Rust variables, use `'var`, as shown in the example above.
@@ -154,11 +154,11 @@ impl<F: FnOnce(&PyDict)> FromInlinePython<F> for () {
 /// Assigning a `python!{}` block to a `Context` will run the Python code and capture the resulting context.
 impl<F: FnOnce(&PyDict)> FromInlinePython<F> for Context {
 	fn from_python_macro(bytecode: &'static [u8], set_variables: F) -> Self {
-		let gil_guard = Python::acquire_gil();
-		let py = gil_guard.python();
-		let context = Context::new_with_gil(py);
-		context.run_with_gil(py, PythonBlock { bytecode, set_variables });
-		context
+		Python::with_gil(|py| {
+			let context = Context::new_with_gil(py);
+			context.run_with_gil(py, PythonBlock { bytecode, set_variables });
+			context
+		})
 	}
 }