Merge pull request #44 from remusao/main

Bumped Pyo3 to 0.20

Author: davidhewitt

CHANGELOG.md

@@ -1,3 +1,7 @@
+## Unreleased
+
+- Update to PyO3 0.20
+
 ## 0.19.0 - 2023-06-11
 
 - Update to PyO3 0.19

Cargo.toml

@@ -12,10 +12,10 @@ documentation = "https://docs.rs/crate/pythonize/"
 
 [dependencies]
 serde = { version = "1.0", default-features = false, features = ["std"] }
-pyo3 = { version = "0.19.0", default-features = false }
+pyo3 = { version = "0.20.0", default-features = false }
 
 [dev-dependencies]
 serde = { version = "1.0", default-features = false, features = ["derive"] }
-pyo3 = { version = "0.19.0", default-features = false, features = ["auto-initialize", "macros"] }
+pyo3 = { version = "0.20.0", default-features = false, features = ["auto-initialize", "macros"] }
 serde_json = "1.0"
 maplit = "1.0.2"

src/de.rs

@@ -85,7 +85,7 @@ impl<'a, 'de> de::Deserializer<'de> for &'a mut Depythonizer<'de> {
             self.deserialize_tuple(obj.len()?, visitor)
         } else if obj.is_instance_of::<PyUnicode>() {
             self.deserialize_str(visitor)
-        } else if let Ok(_) = obj.downcast::<PySequence>() {
+        } else if obj.downcast::<PySequence>().is_ok() {
             self.deserialize_tuple(obj.len()?, visitor)
         } else if obj.downcast::<PyMapping>().is_ok() {
             self.deserialize_map(visitor)
@@ -258,7 +258,7 @@ impl<'a, 'de> de::Deserializer<'de> for &'a mut Depythonizer<'de> {
                 .get_item(0)?
                 .downcast()
                 .map_err(|_| PythonizeError::dict_key_not_string())?;
-            let value = d.get_item(variant).unwrap();
+            let value = d.get_item(variant)?.unwrap();
             let mut de = Depythonizer::from_object(value);
             visitor.visit_enum(PyEnumAccess::new(&mut de, variant))
         } else if item.is_instance_of::<PyString>() {
@@ -437,7 +437,7 @@ mod test {
             let locals = PyDict::new(py);
             py.run(&format!("obj = {}", code), None, Some(locals))
                 .unwrap();
-            let obj = locals.get_item("obj").unwrap();
+            let obj = locals.get_item("obj").unwrap().unwrap();
             let actual: T = depythonize(obj).unwrap();
             assert_eq!(&actual, expected);
             let actual_json: JsonValue = depythonize(obj).unwrap();
@@ -493,7 +493,7 @@ mod test {
             let locals = PyDict::new(py);
             py.run(&format!("obj = {}", code), None, Some(locals))
                 .unwrap();
-            let obj = locals.get_item("obj").unwrap();
+            let obj = locals.get_item("obj").unwrap().unwrap();
             assert!(matches!(
                 *depythonize::<Struct>(obj).unwrap_err().inner,
                 ErrorImpl::Message(msg) if msg == "missing field `bar`"
@@ -523,7 +523,7 @@ mod test {
             let locals = PyDict::new(py);
             py.run(&format!("obj = {}", code), None, Some(locals))
                 .unwrap();
-            let obj = locals.get_item("obj").unwrap();
+            let obj = locals.get_item("obj").unwrap().unwrap();
             assert!(matches!(
                 *depythonize::<TupleStruct>(obj).unwrap_err().inner,
                 ErrorImpl::IncorrectSequenceLength { expected, got } if expected == 2 && got == 3

src/ser.rs

@@ -474,7 +474,7 @@ mod test {
                 None,
                 Some(locals),
             )?;
-            let result = locals.get_item("result").unwrap().extract::<&str>()?;
+            let result = locals.get_item("result")?.unwrap().extract::<&str>()?;
 
             assert_eq!(result, expected);
             assert_eq!(serde_json::to_string(&src).unwrap(), expected);