remove extra traits

Author: andresliszt

src/build_tools.rs

@@ -1,8 +1,7 @@
 use std::error::Error;
 use std::fmt;
 
-use crate::tools::py_err;
-use pyo3::exceptions::{PyException, PyTypeError};
+use pyo3::exceptions::PyException;
 use pyo3::prelude::*;
 use pyo3::types::{PyDict, PyList, PyString};
 use pyo3::{intern, FromPyObject, PyErrArguments};
@@ -196,30 +195,3 @@ impl ExtraBehavior {
         Ok(res)
     }
 }
-
-impl ToPyObject for ExtraBehavior {
-    fn to_object(&self, _py: Python) -> PyObject {
-        match self {
-            ExtraBehavior::Allow => ExtraBehavior::Allow.to_object(_py),
-            ExtraBehavior::Ignore => ExtraBehavior::Ignore.to_object(_py),
-            ExtraBehavior::Forbid => ExtraBehavior::Forbid.to_object(_py),
-        }
-    }
-}
-
-impl FromPyObject<'_> for ExtraBehavior {
-    fn extract(obj: &PyAny) -> PyResult<Self> {
-        if let Ok(string) = obj.extract::<String>() {
-            Ok(match string.as_str() {
-                "allow" => ExtraBehavior::Allow,
-                "ignore" => ExtraBehavior::Ignore,
-                "forbid" => ExtraBehavior::Forbid,
-                _ => {
-                    return py_err!(PyTypeError; "Invalid string for ExtraBehavior. Possible values are allow, ignore and forbid")
-                }
-            })
-        } else {
-            py_err!(PyTypeError; "Expected string value, got {}", obj.get_type())
-        }
-    }
-}

src/validators/arguments.rs

@@ -120,9 +120,7 @@ impl BuildValidator for ArgumentsValidator {
                 None => None,
             },
             loc_by_alias: config.get_as(intern!(py, "loc_by_alias"))?.unwrap_or(true),
-            extra: config
-                .get_as(intern!(py, "extra_fields_behavior"))?
-                .unwrap_or(ExtraBehavior::Forbid),
+            extra: ExtraBehavior::from_schema_or_config(py, schema, config, ExtraBehavior::Forbid)?,
         }
         .into())
     }