third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/python/google/protobuf/internal/type_checkers.py

 # Protocol Buffers - Google's data interchange format
 # Copyright 2008 Google Inc.  All rights reserved.
 # https://developers.google.com/protocol-buffers/
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 27 matching lines @@
 TYPE_TO_SERIALIZE_METHOD: A dictionary with field types and serialization
   function.
 FIELD_TYPE_TO_WIRE_TYPE: A dictionary with field typed and their
   coresponding wire types.
 TYPE_TO_DESERIALIZE_METHOD: A dictionary with field types and deserialization
   function.
 """
 
 __author__ = 'robinson@google.com (Will Robinson)'
 
+import numbers
 import six
 
 if six.PY3:
   long = int
 
 from google.protobuf.internal import api_implementation
 from google.protobuf.internal import decoder
 from google.protobuf.internal import encoder
 from google.protobuf.internal import wire_format
 from google.protobuf import descriptor
@@ skipping 61 matching lines @@
     return self._default_value
 
 
 # IntValueChecker and its subclasses perform integer type-checks
 # and bounds-checks.
 class IntValueChecker(object):
 
   """Checker used for integer fields.  Performs type-check and range check."""
 
   def CheckValue(self, proposed_value):
-    if not isinstance(proposed_value, six.integer_types):
+    if not isinstance(proposed_value, numbers.Integral):
       message = ('%.1024r has type %s, but expected one of: %s' %
                  (proposed_value, type(proposed_value), six.integer_types))
       raise TypeError(message)
-    if not self._MIN <= proposed_value <= self._MAX:
+    if not self._MIN <= int(proposed_value) <= self._MAX:
       raise ValueError('Value out of range: %d' % proposed_value)
     # We force 32-bit values to int and 64-bit values to long to make
     # alternate implementations where the distinction is more significant
     # (e.g. the C++ implementation) simpler.
     proposed_value = self._TYPE(proposed_value)
     return proposed_value
 
   def DefaultValue(self):
     return 0
 
 
 class EnumValueChecker(object):
 
   """Checker used for enum fields.  Performs type-check and range check."""
 
   def __init__(self, enum_type):
     self._enum_type = enum_type
 
   def CheckValue(self, proposed_value):
-    if not isinstance(proposed_value, six.integer_types):
+    if not isinstance(proposed_value, numbers.Integral):
       message = ('%.1024r has type %s, but expected one of: %s' %
                  (proposed_value, type(proposed_value), six.integer_types))
       raise TypeError(message)
-    if proposed_value not in self._enum_type.values_by_number:
+    if int(proposed_value) not in self._enum_type.values_by_number:
       raise ValueError('Unknown enum value: %d' % proposed_value)
     return proposed_value
 
   def DefaultValue(self):
     return self._enum_type.values[0].number
 
 
 class UnicodeValueChecker(object):
 
   """Checker used for string fields.
@@ skipping 48 matching lines @@
   _TYPE = long
 
 
 # Type-checkers for all scalar CPPTYPEs.
 _VALUE_CHECKERS = {
     _FieldDescriptor.CPPTYPE_INT32: Int32ValueChecker(),
     _FieldDescriptor.CPPTYPE_INT64: Int64ValueChecker(),
     _FieldDescriptor.CPPTYPE_UINT32: Uint32ValueChecker(),
     _FieldDescriptor.CPPTYPE_UINT64: Uint64ValueChecker(),
     _FieldDescriptor.CPPTYPE_DOUBLE: TypeCheckerWithDefault(
-        0.0, float, int, long),
+        0.0, numbers.Real),
     _FieldDescriptor.CPPTYPE_FLOAT: TypeCheckerWithDefault(
-        0.0, float, int, long),
+        0.0, numbers.Real),
     _FieldDescriptor.CPPTYPE_BOOL: TypeCheckerWithDefault(
-        False, bool, int),
+        False, bool, numbers.Integral),
     _FieldDescriptor.CPPTYPE_STRING: TypeCheckerWithDefault(b'', bytes),
     }
 
 
 # Map from field type to a function F, such that F(field_num, value)
 # gives the total byte size for a value of the given type.  This
 # byte size includes tag information and any other additional space
 # associated with serializing "value".
 TYPE_TO_BYTE_SIZE_FN = {
     _FieldDescriptor.TYPE_DOUBLE: wire_format.DoubleByteSize,
@@ skipping 102 matching lines @@
       wire_format.WIRETYPE_LENGTH_DELIMITED,
     _FieldDescriptor.TYPE_BYTES:
       wire_format.WIRETYPE_LENGTH_DELIMITED,
     _FieldDescriptor.TYPE_UINT32: wire_format.WIRETYPE_VARINT,
     _FieldDescriptor.TYPE_ENUM: wire_format.WIRETYPE_VARINT,
     _FieldDescriptor.TYPE_SFIXED32: wire_format.WIRETYPE_FIXED32,
     _FieldDescriptor.TYPE_SFIXED64: wire_format.WIRETYPE_FIXED64,
     _FieldDescriptor.TYPE_SINT32: wire_format.WIRETYPE_VARINT,
     _FieldDescriptor.TYPE_SINT64: wire_format.WIRETYPE_VARINT,
     }