|
@@ -396,11 +396,7 @@ def Parse(text, message, ignore_unknown_fields=False):
|
|
"""
|
|
"""
|
|
if not isinstance(text, six.text_type): text = text.decode('utf-8')
|
|
if not isinstance(text, six.text_type): text = text.decode('utf-8')
|
|
try:
|
|
try:
|
|
- if sys.version_info < (2, 7):
|
|
|
|
- # object_pair_hook is not supported before python2.7
|
|
|
|
- js = json.loads(text)
|
|
|
|
- else:
|
|
|
|
- js = json.loads(text, object_pairs_hook=_DuplicateChecker)
|
|
|
|
|
|
+ js = json.loads(text, object_pairs_hook=_DuplicateChecker)
|
|
except ValueError as e:
|
|
except ValueError as e:
|
|
raise ParseError('Failed to load JSON: {0}.'.format(str(e)))
|
|
raise ParseError('Failed to load JSON: {0}.'.format(str(e)))
|
|
return ParseDict(js, message, ignore_unknown_fields)
|
|
return ParseDict(js, message, ignore_unknown_fields)
|