Update to PyO3 0.20.

Author: m-ou-se

Cargo.toml

@@ -14,7 +14,7 @@ autoexamples = false
 
 [dependencies]
 inline-python-macros = { version = "=0.12.0", path = "./macros" }
-pyo3 = { version = "0.19", default-features = false, features = ["auto-initialize"] }
+pyo3 = { version = "0.20", default-features = false, features = ["auto-initialize"] }
 
 [workspace]
 members = ["examples", "ct-python"]

examples/Cargo.toml

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

macros/Cargo.toml

@@ -16,7 +16,7 @@ proc_macro = true
 [dependencies]
 proc-macro2 = { version = "1.0", features = ["span-locations"] }
 quote = "1.0"
-pyo3 = { version = "0.19", default-features = false, features = ["auto-initialize"] }
+pyo3 = { version = "0.20", default-features = false, features = ["auto-initialize"] }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.71"

macros/src/lib.rs

@@ -7,7 +7,7 @@ extern crate proc_macro;
 use self::embed_python::EmbedPython;
 use proc_macro::{Span, TokenStream as TokenStream1};
 use proc_macro2::{Literal, TokenStream};
-use pyo3::{ffi, types::PyBytes, AsPyPointer, FromPyPointer, PyObject, Python};
+use pyo3::{ffi, types::PyBytes, FromPyPointer, PyObject, Python};
 use quote::quote;
 use std::ffi::CString;
 

macros/src/run.rs

@@ -1,6 +1,6 @@
 use crate::error::compile_error_msg;
 use proc_macro2::TokenStream;
-use pyo3::{ffi, AsPyPointer, PyObject, PyResult, Python};
+use pyo3::{ffi, PyObject, PyResult, Python};
 use std::str::FromStr;
 
 #[cfg(unix)]
@@ -34,7 +34,7 @@ fn run_and_capture(py: Python, code: PyObject) -> PyResult<String> {
 	let io = py.import("io")?;
 
 	let stdout = io.getattr("StringIO")?.call0()?;
-	let original_stdout = sys.dict().get_item("stdout");
+	let original_stdout = sys.dict().get_item("stdout")?;
 	sys.dict().set_item("stdout", stdout)?;
 
 	let result =

src/context.rs

@@ -94,8 +94,8 @@ impl Context {
 	/// This function panics if the variable doesn't exist, or the conversion fails.
 	pub fn get_with_gil<'p, T: FromPyObject<'p>>(&'p self, py: Python<'p>, name: &str) -> T {
 		match self.globals(py).get_item(name) {
-			None => panic!("Python context does not contain a variable named `{}`", name),
-			Some(value) => match FromPyObject::extract(value) {
+			Err(_) | Ok(None) => panic!("Python context does not contain a variable named `{}`", name),
+			Ok(Some(value)) => match FromPyObject::extract(value) {
 				Ok(value) => value,
 				Err(e) => {
 					e.print(py);

src/run.rs

@@ -1,5 +1,5 @@
 use crate::Context;
-use pyo3::{ffi, types::PyAny, AsPyPointer, PyObject, PyResult, Python};
+use pyo3::{ffi, types::PyAny, PyObject, PyResult, Python};
 
 pub fn run_python_code<'p>(py: Python<'p>, context: &Context, bytecode: &[u8]) -> PyResult<&'p PyAny> {
 	unsafe {