third_party/protobuf/python/google/protobuf/internal/api_implementation.py - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/python/google/protobuf/internal/api_implementation.py

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: owners Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/python/google/protobuf/descriptor_pool.py ('k') | third_party/protobuf/python/google/protobuf/internal/descriptor_database_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/python/google/protobuf/internal/api_implementation.py

diff --git a/third_party/protobuf/python/google/protobuf/internal/api_implementation.py b/third_party/protobuf/python/google/protobuf/internal/api_implementation.py

index ffcf751167a5a973fa2e48f06a7b2920802fa494..460a4a6c2c8cdab6d142ce5ba6b39ed696d69758 100755

--- a/third_party/protobuf/python/google/protobuf/internal/api_implementation.py

+++ b/third_party/protobuf/python/google/protobuf/internal/api_implementation.py

@@ -32,6 +32,7 @@

"""

import os

+import warnings

import sys

try:

@@ -78,6 +79,11 @@ _implementation_type = os.getenv('PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION',

if _implementation_type != 'python':

_implementation_type = 'cpp'

+if 'PyPy' in sys.version and _implementation_type == 'cpp':

+ warnings.warn('PyPy does not work yet with cpp protocol buffers. '

+ 'Falling back to the python implementation.')

+ _implementation_type = 'python'

# This environment variable can be used to switch between the two

# 'cpp' implementations, overriding the compile-time constants in the

# _api_implementation module. Right now only '2' is supported. Any other