Remove iso8601 dependency #1176
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
added 2 commits
October 13, 2020 12:11
sig does not use iso8601: no need to silence its logging Signed-off-by: Jussi Kukkonen <[email protected]>
Our 'expires' strings are constrained by the ISO8601_DATETIME_SCHEMA
which matches regex '\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z'. This can be
parsed with just a datetime.strptime(): iso8601 module is not needed.
* Add formats.expiry_string_to_datetime() helper function
* Modify the 3 locations that used iso8601 and the api/metadata.py usage
of datetime.strptime()
* Remove related unnecessary logger setup
* Add the missing exception documentation to relevant functions (in many
cases the exception is rather unlikely as the schema has been verified
many times before this though...)
Fixes theupdateframework#1065
Signed-off-by: Jussi Kukkonen <[email protected]>
jku
commented
Oct 13, 2020
| @@ -294,9 +294,8 @@ def from_dict(cls, signed_dict: JsonDict) -> 'Signed': | |||
| # Convert 'expires' TUF metadata string to a datetime object, which is | |||
| # what the constructor expects and what we store. The inverse operation | |||
| # is implemented in 'to_dict'. | |||
| signed_dict['expires'] = datetime.strptime( | |||
| signed_dict['expires'], | |||
| "%Y-%m-%dT%H:%M:%SZ").replace(tzinfo=None) | |||
There was a problem hiding this comment.
note that I'm not doing the replace() in my version: I could not think of a case where it would be useful.
There was a problem hiding this comment.
Makes perfect sense. I guess I thought that strptime might adopt the system timezone. Thanks for removing unnecessary code!
lukpueh
approved these changes
Oct 14, 2020
| @@ -294,9 +294,8 @@ def from_dict(cls, signed_dict: JsonDict) -> 'Signed': | |||
| # Convert 'expires' TUF metadata string to a datetime object, which is | |||
| # what the constructor expects and what we store. The inverse operation | |||
| # is implemented in 'to_dict'. | |||
| signed_dict['expires'] = datetime.strptime( | |||
| signed_dict['expires'], | |||
| "%Y-%m-%dT%H:%M:%SZ").replace(tzinfo=None) | |||
There was a problem hiding this comment.
Makes perfect sense. I guess I thought that strptime might adopt the system timezone. Thanks for removing unnecessary code!
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.
Our 'expires' strings are constrained by the ISO8601_DATETIME_SCHEMA
(meaning regex '\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z'). This can be
parsed with just a datetime.strptime(): iso8601 module is not needed.
of datetime.strptime()
cases the exception is rather unlikely as the schema has been verified
many times before this though...)
Fixes #1065
The reason for doing this is again vendoring into pip: I'd like to not have to vendor iso8601 as well.