Fix timedelta JSON serialization on Python 2.6. #2430
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
| if hasattr(obj, 'total_seconds'): | ||
| return six.text_type(obj.total_seconds()) | ||
| else: # Python 2.6 compatibility | ||
| return six.text_type((obj.microseconds + (obj.seconds + obj.days * 24 * 3600) * 10**6) / 10**6) |
There was a problem hiding this comment.
We isolate any version branching code into compat.py.
Have a function named total_seconds(timedelta) that provides this in compat.py and then call that from here.
Otherwise seems fine.
| @@ -4,7 +4,7 @@ | |||
| """ | |||
|
|
|||
| # flake8: noqa | |||
| from __future__ import unicode_literals | |||
| from __future__ import unicode_literals, division | |||
There was a problem hiding this comment.
I don't think we actually need this - the only division we've added will always be float on both 2 and 3, since we're dividing by a float.
tomchristie
added a commit
that referenced
this pull request
Jan 19, 2015
…liser-python26-support Fix timedelta JSON serialization on Python 2.6.
|
Nice work, thanks! |
This was referenced Mar 9, 2017
This was referenced Oct 16, 2017
This was referenced Nov 6, 2017
This was referenced Nov 14, 2017
This was referenced Dec 10, 2017
This was referenced Dec 20, 2017
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.
Timedelta serialisation does not work on Python 2.6.
timedelta.total_seconds()is only supported since Python 2.7 (https://docs.python.org/2.7/library/datetime.html#datetime.timedelta.total_seconds), so we need a fallback for python 2.6.