upgrade to pyo3 0.21.2 #78
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
davidhewitt
reviewed
Jun 24, 2024
src/datetime.rs
Outdated
Comment on lines
9
to
12
| let py_dt: PyObject = match &datetime.date { | ||
| Some(date) => match &datetime.time { | ||
| Some(t) => { | ||
| let py_tz: PyObject; | ||
| let tzinfo = match &datetime.offset { | ||
| let tzinfo: Option<Bound<'_, PyTzInfo>> = match &datetime.offset { |
There was a problem hiding this comment.
Stylistically I might have been tempted to do this with match (&datetime.date, &datetime.time, &datetime.offset)
src/datetime.rs
Outdated
| Some(offset) => { | ||
| let tz_info = match offset { | ||
| TomlOffset::Z => TzInfo::new(0, 0), | ||
| TomlOffset::Custom { hours, minutes } => TzInfo::new(*hours, *minutes), | ||
| }; | ||
| py_tz = Py::new(py, tz_info)?.to_object(py); | ||
| Some(py_tz.extract(py)?) | ||
| Some(Bound::new(py, tz_info)?.into_any().downcast_into()?) |
There was a problem hiding this comment.
Yep, this is one of the more painful part of the current design, I will probably add .cast_into() as a future replacement for .into_any().downcast_into(). PyO3/pyo3#3988 (comment)
| @@ -9,30 +9,40 @@ use toml::value::Datetime; | |||
| use crate::py_type::PyTypeLookup; | |||
|
|
|||
| pub struct SerializePyObject<'py> { | |||
| obj: &'py PyAny, | |||
| py: Python<'py>, | |||
| obj: Bound<'py, PyAny>, | |||
| none_value: Option<&'py str>, | |||
| ob_type_lookup: &'py PyTypeLookup, | |||
| } | |||
|
|
|||
| impl<'py> SerializePyObject<'py> { | |||
There was a problem hiding this comment.
It might be that you can rely on toml::value::Value implementing Deserialize and use pythonize::depythonize here. Not sure if you need some special logic.
There was a problem hiding this comment.
I think we need custom logic.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@davidhewitt, a quick review would be much appreciated.