fix listen_bucket_notification #657
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
use json.decoder.JSONDecodeError instead of SyntaxError
harshavardhana
previously approved these changes
May 31, 2018
vadmeste
reviewed
May 31, 2018
minio/api.py
Outdated
| @@ -505,7 +505,7 @@ def listen_bucket_notification(self, bucket_name, prefix='', suffix='', | |||
| event = json.loads(line) | |||
| if event['Records'] is not None: | |||
| yield event | |||
| except SyntaxError: | |||
| except json.decoder.JSONDecodeError: | |||
There was a problem hiding this comment.
@WaYdotNET thanks for the PR.
We actually want to support both python 2 & 3. Python 2 doesn't know json.decoder.JSONDecodeError and parsing wrong json raises ValueError exception. Now, since json.decoder.JSONDecodeError is a subclass of ValueError, catching ValueError instead of json.decoder.JSONDecodeError will work for both python 2 & 3.
What do you think ?
There was a problem hiding this comment.
@vadmeste @harshavardhana
I preferred check if JSONDecodeError exist :
try:
from json.decoder import JSONDecodeError
except ImportError:
JSONDecodeError = ValueError except JSONDecodeError:What do you think ?
There was a problem hiding this comment.
@WaYdotNET I am good with your idea.
fix python2 compatibility
harshavardhana
approved these changes
Jun 4, 2018
nitisht
approved these changes
Jun 7, 2018
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.
use json.decoder.JSONDecodeError instead of SyntaxError
ref #652