PYTHON-2361 Support parsing as extended JSON representation for subtype 4 binary #483
Conversation
This file contains hidden or 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
|
I took the opportunity to resync all bson corpus spec tests. |
prashantmital
commented
Sep 9, 2020
prashantmital
commented
Sep 9, 2020
prashantmital
commented
Sep 9, 2020
test/test_bson_corpus.py
Outdated
| decode_extjson(parse_error_case['string']) | ||
| raise AssertionError('exception not raised for test ' | ||
| 'case: ' + description) | ||
| except (AttributeError, ValueError): |
There was a problem hiding this comment.
The AttributeError is raised when the $uuid field contains a value of the incorrect type - in this case a document.
ERROR: test_binary (test.test_bson_corpus.TestBSONCorpus)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/Users/pmital/Developer/mongo-python-driver/test/test_bson_corpus.py", line 210, in run_test
decode_extjson(parse_error_case['string'])
File "/Users/pmital/Developer/mongo-python-driver/bson/json_util.py", line 409, in loads
return json.loads(s, *args, **kwargs)
File "/Users/pmital/.pyenv/versions/3.7.5/lib/python3.7/json/__init__.py", line 361, in loads
return cls(**kw).decode(s)
File "/Users/pmital/.pyenv/versions/3.7.5/lib/python3.7/json/decoder.py", line 337, in decode
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/Users/pmital/.pyenv/versions/3.7.5/lib/python3.7/json/decoder.py", line 353, in raw_decode
obj, end = self.scan_once(s, idx)
File "/Users/pmital/Developer/mongo-python-driver/bson/json_util.py", line 408, in <lambda>
pairs, json_options)
File "/Users/pmital/Developer/mongo-python-driver/bson/json_util.py", line 428, in object_pairs_hook
return object_hook(json_options.document_class(pairs), json_options)
File "/Users/pmital/Developer/mongo-python-driver/bson/json_util.py", line 452, in object_hook
return _parse_legacy_uuid(dct, json_options)
File "/Users/pmital/Developer/mongo-python-driver/bson/json_util.py", line 494, in _parse_legacy_uuid
return uuid.UUID(doc["$uuid"])
File "/Users/pmital/.pyenv/versions/3.7.5/lib/python3.7/uuid.py", line 157, in __init__
hex = hex.replace('urn:', '').replace('uuid:', '')
AttributeError: 'SON' object has no attribute 'replace'
Since this is a fairly hard to understand error message for a user, I think we should manually validate that the type is correct (and raise something more sensible like a TypeError). Would you agree?
prashantmital
force-pushed
the
SPEC-1582/uuid-extjson
branch
from
a57f5f6 to
8b35301
Compare
prashantmital
commented
Sep 9, 2020
| @@ -508,6 +508,8 @@ def _parse_legacy_uuid(doc, json_options): | |||
| """Decode a JSON legacy $uuid to Python UUID.""" | |||
| if len(doc) != 1: | |||
| raise TypeError('Bad $uuid, extra field(s): %s' % (doc,)) | |||
| if not isinstance(doc["$uuid"], text_type): | |||
| raise TypeError('$uuid must be a string: %s' % (doc,)) | |||
There was a problem hiding this comment.
Used the same format for the error message as $binary base64
|
@ShaneHarvey ready for another look. |
ShaneHarvey
approved these changes
Sep 9, 2020
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.
No description provided.