Fixed #29869 -- Made UUIDField.to_python() convert int values. #10557
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
charettes
reviewed
Oct 24, 2018
django/db/models/fields/__init__.py
Outdated
| @@ -2319,6 +2319,8 @@ def get_db_prep_value(self, value, connection, prepared=False): | |||
|
|
|||
| def to_python(self, value): | |||
| if value is not None and not isinstance(value, uuid.UUID): | |||
| if isinstance(value, int): | |||
| return uuid.UUID(int=value) | |||
There was a problem hiding this comment.
This needs to be done in the ValueError try/except below as this will fail for integer larger than 128 bits. A test should be added for this case as well.
> uuid.UUID(int=(2 ** 128) - 1)
UUID('ffffffff-ffff-ffff-ffff-ffffffffffff')
> uuid.UUID(int=(2 ** 128))
ValueError: int is out of range (need a 128-bit value)There was a problem hiding this comment.
Oh, yes! We should check that.
I've modified the patch to keep a check on these things. Can you have a look now, please?
CuriousLearner
force-pushed
the
ticket_29869
branch
from
22834a6
to
1f3fb8f
Compare
charettes
reviewed
Oct 24, 2018
django/db/models/fields/__init__.py
Outdated
| self.error_messages['invalid'], | ||
| code='invalid', | ||
| params={'value': value}, | ||
| ) |
There was a problem hiding this comment.
We should find a way to reduce the duplication between the two blocks. What about
form = 'int' if isinstance(value, int) else 'hex'
try:
return uuid.UUID(**{form: value})
except (AttributeError, ValueError):
raise exceptions.ValidationError(
self.error_messages['invalid'],
code='invalid',
params={'value': value},
)There was a problem hiding this comment.
Yeah, this actually looks good to me!
I've made these change! Thanks a lot for you suggestion :)
charettes
changed the title
CuriousLearner
force-pushed
the
ticket_29869
branch
from
1f3fb8f
to
01e3818
Compare
charettes
approved these changes
Oct 24, 2018
timgraham
force-pushed
the
ticket_29869
branch
from
01e3818
to
deb9caa
Compare
timgraham
force-pushed
the
ticket_29869
branch
from
deb9caa
to
83c7096
Compare
|
Thanks for reviewing and merging |
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.
https://code.djangoproject.com/ticket/29869