Push out changes from internal codebase.

All Languages
* Repeated fields of primitive types (types other that string, group, and
  nested messages) may now use the option [packed = true] to get a more
  efficient encoding.  In the new encoding, the entire list is written
  as a single byte blob using the "length-delimited" wire type.  Within
  this blob, the individual values are encoded the same way they would
  be normally except without a tag before each value (thus, they are
  tightly "packed").

C++
* UnknownFieldSet now supports STL-like iteration.
* Message interface has method ParseFromBoundedZeroCopyStream() which parses
  a limited number of bytes from an input stream rather than parsing until
  EOF.

Java
* Fixed bug where Message.mergeFrom(Message) failed to merge extensions.
* Message interface has new method toBuilder() which is equivalent to
  newBuilderForType().mergeFrom(this).
* All enums now implement the ProtocolMessageEnum interface.
* Setting a field to null now throws NullPointerException.
* Fixed tendency for TextFormat's parsing to overflow the stack when
  parsing large string values.  The underlying problem is with Java's
  regex implementation (which unfortunately uses recursive backtracking
  rather than building an NFA).  Worked around by making use of possesive
  quantifiers.

Python
* Updated RPC interfaces to allow for blocking operation.  A client may
  now pass None for a callback when making an RPC, in which case the
  call will block until the response is received, and the response
  object will be returned directly to the caller.  This interface change
  cannot be used in practice until RPC implementations are updated to
  implement it.

1 files changed, 19 insertions, 16 deletions

diff --git a/python/google/protobuf/internal/wire_format.py b/python/google/protobuf/internal/wire_format.py
index 5f0af11e..531c9b85 100755
--- a/python/google/protobuf/internal/wire_format.py
+++ b/python/google/protobuf/internal/wire_format.py
@@ -120,6 +120,10 @@ def Int32ByteSize(field_number, int32):
   return Int64ByteSize(field_number, int32)
 
 
+def Int32ByteSizeNoTag(int32):
+  return _VarUInt64ByteSizeNoTag(0xffffffffffffffff & int32)
+
+
 def Int64ByteSize(field_number, int64):
   # Have to convert to uint before calling UInt64ByteSize().
   return UInt64ByteSize(field_number, 0xffffffffffffffff & int64)
@@ -130,7 +134,7 @@ def UInt32ByteSize(field_number, uint32):
 
 
 def UInt64ByteSize(field_number, uint64):
-  return _TagByteSize(field_number) + _VarUInt64ByteSizeNoTag(uint64)
+  return TagByteSize(field_number) + _VarUInt64ByteSizeNoTag(uint64)
 
 
 def SInt32ByteSize(field_number, int32):
@@ -142,31 +146,31 @@ def SInt64ByteSize(field_number, int64):
 
 
 def Fixed32ByteSize(field_number, fixed32):
-  return _TagByteSize(field_number) + 4
+  return TagByteSize(field_number) + 4
 
 
 def Fixed64ByteSize(field_number, fixed64):
-  return _TagByteSize(field_number) + 8
+  return TagByteSize(field_number) + 8
 
 
 def SFixed32ByteSize(field_number, sfixed32):
-  return _TagByteSize(field_number) + 4
+  return TagByteSize(field_number) + 4
 
 
 def SFixed64ByteSize(field_number, sfixed64):
-  return _TagByteSize(field_number) + 8
+  return TagByteSize(field_number) + 8
 
 
 def FloatByteSize(field_number, flt):
-  return _TagByteSize(field_number) + 4
+  return TagByteSize(field_number) + 4
 
 
 def DoubleByteSize(field_number, double):
-  return _TagByteSize(field_number) + 8
+  return TagByteSize(field_number) + 8
 
 
 def BoolByteSize(field_number, b):
-  return _TagByteSize(field_number) + 1
+  return TagByteSize(field_number) + 1
 
 
 def EnumByteSize(field_number, enum):
@@ -178,18 +182,18 @@ def StringByteSize(field_number, string):
 
 
 def BytesByteSize(field_number, b):
-  return (_TagByteSize(field_number)
+  return (TagByteSize(field_number)
           + _VarUInt64ByteSizeNoTag(len(b))
           + len(b))
 
 
 def GroupByteSize(field_number, message):
-  return (2 * _TagByteSize(field_number)  # START and END group.
+  return (2 * TagByteSize(field_number)  # START and END group.
           + message.ByteSize())
 
 
 def MessageByteSize(field_number, message):
-  return (_TagByteSize(field_number)
+  return (TagByteSize(field_number)
           + _VarUInt64ByteSizeNoTag(message.ByteSize())
           + message.ByteSize())
 
@@ -199,7 +203,7 @@ def MessageSetItemByteSize(field_number, msg):
   # There are 2 tags for the beginning and ending of the repeated group, that
   # is field number 1, one with field number 2 (type_id) and one with field
   # number 3 (message).
-  total_size = (2 * _TagByteSize(1) + _TagByteSize(2) + _TagByteSize(3))
+  total_size = (2 * TagByteSize(1) + TagByteSize(2) + TagByteSize(3))
 
   # Add the number of bytes for type_id.
   total_size += _VarUInt64ByteSizeNoTag(field_number)
@@ -214,15 +218,14 @@ def MessageSetItemByteSize(field_number, msg):
   return total_size
 
 
-# Private helper functions for the *ByteSize() functions above.
-
-
-def _TagByteSize(field_number):
+def TagByteSize(field_number):
   """Returns the bytes required to serialize a tag with this field number."""
   # Just pass in type 0, since the type won't affect the tag+type size.
   return _VarUInt64ByteSizeNoTag(PackTag(field_number, 0))
 
 
+# Private helper function for the *ByteSize() functions above.
+
 def _VarUInt64ByteSizeNoTag(uint64):
   """Returns the bytes required to serialize a single varint.
   uint64 must be unsigned.