| Index: third_party/grpc/src/python/grpcio/grpc/framework/alpha/exceptions.py
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py b/third_party/grpc/src/python/grpcio/grpc/framework/alpha/exceptions.py
|
| similarity index 77%
|
| copy from third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py
|
| copy to third_party/grpc/src/python/grpcio/grpc/framework/alpha/exceptions.py
|
| index 429f58186e3fce43dc21e81e0f9d7e20c7e0bf70..5234d3b91cebbffc07efa29c8738614ec2196460 100644
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py
|
| +++ b/third_party/grpc/src/python/grpcio/grpc/framework/alpha/exceptions.py
|
| @@ -1,4 +1,4 @@
|
| -# Copyright 2010, Google Inc.
|
| +# Copyright 2015, Google Inc.
|
| # All rights reserved.
|
| #
|
| # Redistribution and use in source and binary forms, with or without
|
| @@ -27,20 +27,22 @@
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| +"""Exceptions raised by GRPC.
|
|
|
| -from mod_pywebsocket import msgutil
|
| +Only GRPC should instantiate and raise these exceptions.
|
| +"""
|
|
|
| +import abc
|
|
|
| -_GOODBYE_MESSAGE = 'Goodbye'
|
|
|
| +class RpcError(Exception):
|
| + """Common super type for all exceptions raised by GRPC."""
|
| + __metaclass__ = abc.ABCMeta
|
|
|
| -def web_socket_do_extra_handshake(request):
|
| - pass # Always accept.
|
|
|
| +class CancellationError(RpcError):
|
| + """Indicates that an RPC has been cancelled."""
|
|
|
| -def web_socket_transfer_data(request):
|
| - while True:
|
| - line = msgutil.receive_message(request)
|
| - msgutil.send_message(request, line)
|
| - if line == _GOODBYE_MESSAGE:
|
| - return
|
| +
|
| +class ExpirationError(RpcError):
|
| + """Indicates that an RPC has expired ("timed out")."""
|
|
|