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, 15 insertions, 2 deletions

diff --git a/python/google/protobuf/service.py b/python/google/protobuf/service.py
index 3989216a..9ec42fe3 100755
--- a/python/google/protobuf/service.py
+++ b/python/google/protobuf/service.py
@@ -31,7 +31,7 @@
 """Declares the RPC service interfaces.
 
 This module declares the abstract interfaces underlying proto2 RPC
-services.  These are intented to be independent of any particular RPC
+services.  These are intended to be independent of any particular RPC
 implementation, so that proto2 services can be used on top of a variety
 of implementations.
 """
@@ -39,6 +39,11 @@ of implementations.
 __author__ = 'petar@google.com (Petar Petrov)'
 
 
+class RpcException(Exception):
+  """Exception raised on failed blocking RPC method call."""
+  pass
+
+
 class Service(object):
 
   """Abstract base interface for protocol-buffer-based RPC services.
@@ -49,7 +54,7 @@ class Service(object):
   its exact type at compile time (analogous to the Message interface).
   """
 
-  def GetDescriptor(self):
+  def GetDescriptor():
     """Retrieves this service's descriptor."""
     raise NotImplementedError
 
@@ -57,6 +62,14 @@ class Service(object):
                  request, done):
     """Calls a method of the service specified by method_descriptor.
 
+    If "done" is None then the call is blocking and the response
+    message will be returned directly.  Otherwise the call is asynchronous
+    and "done" will later be called with the response value.
+
+    In the blocking case, RpcException will be raised on error.
+    Asynchronous calls must check status via the Failed method of the
+    RpcController.
+
     Preconditions:
     * method_descriptor.service == GetDescriptor
     * request is of the exact same classes as returned by