fixes for py.None() change

Author: davidhewitt

src/argument_markers.rs

@@ -50,7 +50,7 @@ impl ArgsKwargs {
                 Ok(b) => (!b).into_py(py),
                 Err(e) => e.into_py(py),
             },
-            _ => py.NotImplemented(),
+            _ => py.NotImplemented().into(),
         }
     }
 

src/errors/validation_exception.rs

@@ -294,12 +294,12 @@ impl ValidationError {
             // away safely.
             self.line_errors.iter().map(|e| -> PyObject {
                 if iteration_error.is_some() {
-                    return py.None();
+                    return py.None().into();
                 }
                 e.as_dict(py, url_prefix, include_context, self.input_type, include_input)
                     .unwrap_or_else(|err| {
                         iteration_error = Some(err);
-                        py.None()
+                        py.None().into()
                     })
             }),
         );
@@ -489,7 +489,7 @@ impl TryFrom<&PyAny> for PyLineError {
 
         let input_value = match dict.get_item("input")? {
             Some(i) => i.into_py(py),
-            None => py.None(),
+            None => py.None().into(),
         };
 
         Ok(Self {

src/input/datetime.rs

@@ -530,7 +530,7 @@ impl TzInfo {
 
     fn fromutc<'py>(&self, dt: &'py PyDateTime) -> PyResult<&'py PyAny> {
         let py = dt.py();
-        dt.call_method1("__add__", (self.utcoffset(py, py.None().as_ref(py))?,))
+        dt.call_method1("__add__", (self.utcoffset(py, py.None())?,))
     }
 
     fn __repr__(&self) -> String {

src/serializers/ob_type.rs

@@ -62,7 +62,7 @@ pub enum IsType {
 impl ObTypeLookup {
     fn new(py: Python) -> Self {
         Self {
-            none: py.None().as_ref(py).get_type_ptr() as usize,
+            none: py.None().get_type_ptr() as usize,
             int: PyInt::type_object_raw(py) as usize,
             bool: PyBool::type_object_raw(py) as usize,
             float: PyFloat::type_object_raw(py) as usize,

src/url.rs

@@ -469,8 +469,8 @@ fn host_to_dict<'a>(py: Python<'a>, lib_url: &Url) -> PyResult<&'a PyDict> {
     dict.set_item(
         "username",
         match lib_url.username() {
-            "" => py.None(),
-            user => user.into_py(py),
+            "" => py.None().into(),
+            user => user.to_object(py),
         },
     )?;
     dict.set_item("password", lib_url.password())?;

src/validators/dataclass.rs

@@ -398,7 +398,7 @@ impl Validator for DataclassArgsValidator {
             // which doesn't make much sense in this context but we need to put something there
             // so that function validators that sit between DataclassValidator and DataclassArgsValidator
             // always get called the same shape of data.
-            Ok(PyTuple::new(py, vec![dict.to_object(py), py.None()]).into_py(py))
+            Ok(PyTuple::new(py, vec![dict.to_object(py), py.None().into()]).into_py(py))
         };
 
         if let Some(field) = self.fields.iter().find(|f| f.name == field_name) {

src/validators/function.rs

@@ -68,7 +68,7 @@ macro_rules! impl_build {
                     func: func_info.function,
                     config: match config {
                         Some(c) => c.into(),
-                        None => py.None(),
+                        None => py.None().into(),
                     },
                     name,
                     field_name: func_info.field_name,
@@ -209,7 +209,7 @@ impl BuildValidator for FunctionPlainValidator {
             func: function_info.function.clone(),
             config: match config {
                 Some(c) => c.into(),
-                None => py.None(),
+                None => py.None().into(),
             },
             name: format!(
                 "function-plain[{}()]",
@@ -275,7 +275,7 @@ impl BuildValidator for FunctionWrapValidator {
             func: function_info.function.clone(),
             config: match config {
                 Some(c) => c.into(),
-                None => py.None(),
+                None => py.None().into(),
             },
             name: format!("function-wrap[{}()]", function_name(function_info.function.as_ref(py))?),
             field_name: function_info.field_name.clone(),

src/validators/mod.rs

@@ -405,7 +405,7 @@ impl<'py> SelfValidator<'py> {
         Ok(SchemaValidator {
             validator,
             definitions,
-            py_schema: py.None(),
+            py_schema: py.None().into(),
             py_config: None,
             title: "Self Schema".into_py(py),
             hide_input_in_errors: false,

src/validators/model_fields.rs

@@ -427,7 +427,7 @@ impl Validator for ModelFieldsValidator {
                 new_data.update(non_extra_data.as_mapping())?;
                 new_extra.to_object(py)
             }
-            _ => py.None(),
+            _ => py.None().into(),
         };
 
         let fields_set: &PySet = PySet::new(py, &[field_name.to_string()])?;

src/validators/none.rs

@@ -31,7 +31,7 @@ impl Validator for NoneValidator {
         _state: &mut ValidationState,
     ) -> ValResult<PyObject> {
         match input.is_none() {
-            true => Ok(py.None()),
+            true => Ok(py.None().into()),
             false => Err(ValError::new(ErrorTypeDefaults::NoneRequired, input)),
         }
     }

src/validators/nullable.rs

@@ -40,7 +40,7 @@ impl Validator for NullableValidator {
         state: &mut ValidationState,
     ) -> ValResult<PyObject> {
         match input.is_none() {
-            true => Ok(py.None()),
+            true => Ok(py.None().into()),
             false => self.validator.validate(py, input, state),
         }
     }