Fixed #24727 -- Prevented ClearableFileInput from masking exceptions on Python 2. #6143
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
| @@ -372,7 +372,10 @@ def is_initial(self, value): | |||
| """ | |||
| Return whether value is considered to be initial value. | |||
| """ | |||
| return bool(value and hasattr(value, 'url')) | |||
| try: | |||
| return bool(value and getattr(value, 'url')) | |||
There was a problem hiding this comment.
For simplicity, my instinct would be to revert hasattr when dropping Python 2 support. If you agree, could you add a comment about it?
There was a problem hiding this comment.
Done.
(I also fixed typo in the commit message)
timgraham
changed the title
| try: | ||
| # TODO: switch back to use hasattr when Python 2 support is dropped | ||
| return bool(value and getattr(value, 'url')) | ||
| except AttributeError: |
There was a problem hiding this comment.
Actually, the try...except dance is not necessary here. I'll update it to bool(value and getattr(value, 'url', False)).
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/24727