diff --git a/src/lib.rs b/src/lib.rs index 183c898..52c9139 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -34,19 +34,19 @@ impl ToPyObject for Result { fn to_object(&self, py: Python) -> PyObject { let dict = PyDict::new(py); - dict.set_item("email", self.email.to_object(py)).unwrap(); - dict.set_item("has_valid_syntax", self.has_valid_syntax.to_object(py)) + dict.set_item("email", self.email.clone()).unwrap(); + dict.set_item("has_valid_syntax", self.has_valid_syntax) .unwrap(); if let Some(mx) = self.mx.as_ref() { - dict.set_item("mx", mx.to_object(py)).unwrap() + dict.set_item("mx", mx).unwrap() } if let Some(misc) = self.misc.as_ref() { - dict.set_item("misc", misc.to_object(py)).unwrap() + dict.set_item("misc", misc).unwrap() } if let Some(smtp) = self.smtp.as_ref() { - dict.set_item("smtp", smtp.to_object(py)).unwrap() + dict.set_item("smtp", smtp).unwrap() } - dict.to_object(py) + dict.into() } } #[pyfunction] diff --git a/src/misc/mod.rs b/src/misc/mod.rs index 856b8bb..1bc0c91 100644 --- a/src/misc/mod.rs +++ b/src/misc/mod.rs @@ -45,13 +45,11 @@ impl Misc { impl ToPyObject for Misc { fn to_object(&self, py: Python) -> PyObject { let dict = PyDict::new(py); - dict.set_item("is_disposable", self.is_disposable.to_object(py)) + dict.set_item("is_disposable", self.is_disposable).unwrap(); + dict.set_item("is_free", self.is_free).unwrap(); + dict.set_item("is_role_account", self.is_role_account) .unwrap(); - dict.set_item("is_free", self.is_free.to_object(py)) - .unwrap(); - dict.set_item("is_role_account", self.is_role_account.to_object(py)) - .unwrap(); - dict.to_object(py) + dict.into() } } diff --git a/src/mx/mod.rs b/src/mx/mod.rs index df586d8..6ddabc5 100644 --- a/src/mx/mod.rs +++ b/src/mx/mod.rs @@ -22,11 +22,11 @@ impl Mx { impl ToPyObject for Mx { fn to_object(&self, py: Python) -> PyObject { let dict = PyDict::new(py); - dict.set_item("has_mx_records", self.has_mx_records.to_object(py)) + dict.set_item("has_mx_records", self.has_mx_records) .unwrap(); - dict.set_item("mx_records", self.mx_records.to_object(py)) + dict.set_item("mx_records", self.mx_records.clone()) .unwrap(); - dict.to_object(py) + dict.into() } } diff --git a/src/settings.rs b/src/settings.rs index 40bd8cf..0e926cc 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -33,7 +33,7 @@ impl Settings { let from_email = get_string_from_env("FROM_EMAIL", "user@example.org"); let hello_name = get_string_from_env("HELLO_NAME", "localhost"); let smtp_port = get_int_from_env("SMTP_PORT", 25); - let smtp_timeout = get_int_from_env("SMTP_TIMEOUT", 10); + let smtp_timeout = get_int_from_env("SMTP_TIMEOUT", 5); let check_smtp = match std::env::var("CHECK_SMTP") { Ok(val) => val == "true", Err(_) => false, diff --git a/src/smtp/mod.rs b/src/smtp/mod.rs index 472843d..f81a25f 100644 --- a/src/smtp/mod.rs +++ b/src/smtp/mod.rs @@ -25,9 +25,9 @@ impl Smtp { impl ToPyObject for Smtp { fn to_object(&self, py: Python) -> PyObject { let dict = PyDict::new(py); - dict.set_item("is_deliverable", self.is_deliverable.to_object(py)) + dict.set_item("is_deliverable", self.is_deliverable) .unwrap(); - dict.to_object(py) + dict.into() } } impl Smtp {