update to use new FromPyObject

Author: davidhewitt

src/errors/types.rs

@@ -781,8 +781,8 @@ impl From<Int> for Number {
 }
 
 impl FromPyObject<'_> for Number {
-    fn extract(obj: &PyAny) -> PyResult<Self> {
-        if let Ok(int) = extract_i64(Py2::borrowed_from_gil_ref(&obj)) {
+    fn extract(obj: &Py2<'_, PyAny>) -> PyResult<Self> {
+        if let Ok(int) = extract_i64(obj) {
             Ok(Number::Int(int))
         } else if let Ok(float) = obj.extract::<f64>() {
             Ok(Number::Float(float))

src/input/return_enums.rs

@@ -1031,7 +1031,7 @@ impl<'a> Rem for &'a Int {
 }
 
 impl FromPyObject<'_> for Int {
-    fn extract(obj: &PyAny) -> PyResult<Self> {
+    fn extract(obj: &Py2<'_, PyAny>) -> PyResult<Self> {
         if let Ok(i) = obj.extract::<i64>() {
             Ok(Int::I64(i))
         } else if let Ok(b) = obj.extract::<BigInt>() {

src/lookup_key.rs

@@ -54,17 +54,18 @@ impl fmt::Display for LookupKey {
 impl LookupKey {
     pub fn from_py(py: Python, value: &Py2<'_, PyAny>, alt_alias: Option<&str>) -> PyResult<Self> {
         if let Ok(alias_py) = value.downcast::<PyString>() {
-            let alias: &str = alias_py.extract()?;
+            let alias: String = alias_py.extract()?;
+            let path1 = LookupPath::from_str(py, &alias, Some(alias_py.clone()));
             match alt_alias {
                 Some(alt_alias) => Ok(Self::Choice {
                     key1: alias.to_string(),
                     py_key1: alias_py.clone().into(),
-                    path1: LookupPath::from_str(py, alias, Some(alias_py.clone())),
+                    path1,
                     key2: alt_alias.to_string(),
                     py_key2: PyString::new2(py, alt_alias).into(),
                     path2: LookupPath::from_str(py, alt_alias, None),
                 }),
-                None => Ok(Self::simple(py, alias, Some(alias_py.clone()))),
+                None => Ok(Self::simple(py, &alias, Some(alias_py.clone()))),
             }
         } else {
             let list = value.downcast::<PyList>()?;

src/serializers/config.rs

@@ -217,8 +217,7 @@ impl FromStr for InfNanMode {
 }
 
 impl FromPyObject<'_> for InfNanMode {
-    fn extract(ob: &PyAny) -> PyResult<Self> {
-        let s = ob.extract::<&str>()?;
-        Self::from_str(s)
+    fn extract(ob: &Py2<'_, PyAny>) -> PyResult<Self> {
+        Self::from_str(ob.downcast::<PyString>()?.to_str()?)
     }
 }

src/url.rs

@@ -434,9 +434,9 @@ impl UrlHostParts {
 }
 
 impl FromPyObject<'_> for UrlHostParts {
-    fn extract(ob: &PyAny) -> PyResult<Self> {
+    fn extract(ob: &Py2<'_, PyAny>) -> PyResult<Self> {
         let py = ob.py();
-        let dict = Py2::borrowed_from_gil_ref(&ob).downcast::<PyDict>()?;
+        let dict = ob.downcast::<PyDict>()?;
         Ok(UrlHostParts {
             username: dict.get_as(intern!(py, "username"))?,
             password: dict.get_as(intern!(py, "password"))?,