diff options
Diffstat (limited to 'python/google')
-rw-r--r-- | python/google/protobuf/json_format.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/python/google/protobuf/json_format.py b/python/google/protobuf/json_format.py index 8af6cd20..be6a9b63 100644 --- a/python/google/protobuf/json_format.py +++ b/python/google/protobuf/json_format.py @@ -69,10 +69,9 @@ _INFINITY = 'Infinity' _NEG_INFINITY = '-Infinity' _NAN = 'NaN' -if sys.version_info < (3, 0): - _UNPAIRED_SURROGATE_PATTERN = re.compile(six.u( - r'[\ud800-\udbff](?![\udc00-\udfff])|(?<![\ud800-\udbff])[\udc00-\udfff]' - )) +_UNPAIRED_SURROGATE_PATTERN = re.compile(six.u( + r'[\ud800-\udbff](?![\udc00-\udfff])|(?<![\ud800-\udbff])[\udc00-\udfff]' +)) class Error(Exception): """Top-level module error for json_format.""" @@ -559,13 +558,12 @@ def _ConvertScalarFieldValue(value, field, require_str=False): elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_STRING: if field.type == descriptor.FieldDescriptor.TYPE_BYTES: return base64.b64decode(value) - elif sys.version_info < (3, 0): - # Python 2.x does not detect unpaired surrogates when JSON parsing. + else: + # Checking for unpaired surrogates appears to be unreliable, + # depending on the specific Python version, so we check manually. if _UNPAIRED_SURROGATE_PATTERN.search(value): raise ParseError('Unpaired surrogate') return value - else: - return value elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_ENUM: # Convert an enum value. enum_value = field.enum_type.values_by_name.get(value, None) |