diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2015-02-25 16:39:11 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-02-25 16:39:11 -0800 |
| commit | ada65567852b96fdb4d070c0c3f86ca7b77824f9 (patch) | |
| tree | a506994ce921ace3e6f88ca130a17af7f85c3d0f /python/google/protobuf/reflection.py | |
| parent | 581be24606a925d038f382dc4c86256e2d29e001 (diff) | |
| download | protobuf-ada65567852b96fdb4d070c0c3f86ca7b77824f9.tar.gz protobuf-ada65567852b96fdb4d070c0c3f86ca7b77824f9.tar.bz2 protobuf-ada65567852b96fdb4d070c0c3f86ca7b77824f9.zip | |
Down integrate from Google internal.
Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145
Diffstat (limited to 'python/google/protobuf/reflection.py')
| -rwxr-xr-x | python/google/protobuf/reflection.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/python/google/protobuf/reflection.py b/python/google/protobuf/reflection.py index 1fc704a2..55e653a0 100755 --- a/python/google/protobuf/reflection.py +++ b/python/google/protobuf/reflection.py @@ -56,18 +56,12 @@ _FieldDescriptor = descriptor_mod.FieldDescriptor if api_implementation.Type() == 'cpp': - if api_implementation.Version() == 2: - from google.protobuf.pyext import cpp_message - _NewMessage = cpp_message.NewMessage - _InitMessage = cpp_message.InitMessage - else: - from google.protobuf.internal import cpp_message - _NewMessage = cpp_message.NewMessage - _InitMessage = cpp_message.InitMessage + from google.protobuf.pyext import cpp_message as message_impl else: - from google.protobuf.internal import python_message - _NewMessage = python_message.NewMessage - _InitMessage = python_message.InitMessage + from google.protobuf.internal import python_message as message_impl + +_NewMessage = message_impl.NewMessage +_InitMessage = message_impl.InitMessage class GeneratedProtocolMessageType(type): @@ -127,7 +121,6 @@ class GeneratedProtocolMessageType(type): superclass = super(GeneratedProtocolMessageType, cls) new_class = superclass.__new__(cls, name, bases, dictionary) - setattr(descriptor, '_concrete_class', new_class) return new_class def __init__(cls, name, bases, dictionary): @@ -151,6 +144,7 @@ class GeneratedProtocolMessageType(type): _InitMessage(descriptor, cls) superclass = super(GeneratedProtocolMessageType, cls) superclass.__init__(name, bases, dictionary) + setattr(descriptor, '_concrete_class', cls) def ParseMessage(descriptor, byte_str): |