| Index: third_party/protobuf/python/google/protobuf/internal/import_test_package/__init__.py
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-path_wsh.py b/third_party/protobuf/python/google/protobuf/internal/import_test_package/__init__.py
|
| similarity index 83%
|
| copy from third_party/WebKit/LayoutTests/http/tests/websocket/echo-path_wsh.py
|
| copy to third_party/protobuf/python/google/protobuf/internal/import_test_package/__init__.py
|
| index 6072a28e6c821bdf301d4c1cf7e2c50c2cebdeef..5121dd0ec58ff275d215edafc2e84c1c7b800e0a 100644
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-path_wsh.py
|
| +++ b/third_party/protobuf/python/google/protobuf/internal/import_test_package/__init__.py
|
| @@ -1,4 +1,6 @@
|
| -# Copyright (C) 2013 Google Inc. All rights reserved.
|
| +# 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
|
| @@ -26,13 +28,6 @@
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| +"""Sample module importing a nested proto from itself."""
|
|
|
| -from mod_pywebsocket import common, msgutil
|
| -
|
| -
|
| -def web_socket_do_extra_handshake(request):
|
| - pass
|
| -
|
| -
|
| -def web_socket_transfer_data(request):
|
| - msgutil.send_message(request, request.uri)
|
| +from google.protobuf.internal.import_test_package import outer_pb2 as myproto
|
|
|