diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2015-10-05 11:59:43 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-10-05 11:59:43 -0700 |
| commit | 46e8ff63cb67a6520711da5317aaaef04d0414d0 (patch) | |
| tree | 64370726fe469f8dfca7b14f8b8cb80b6cc856f6 /python/google/protobuf/pyext/extension_dict.cc | |
| parent | 0087da9d4775f79c67362cc89c653f3a33a9bae2 (diff) | |
| download | protobuf-46e8ff63cb67a6520711da5317aaaef04d0414d0.tar.gz protobuf-46e8ff63cb67a6520711da5317aaaef04d0414d0.tar.bz2 protobuf-46e8ff63cb67a6520711da5317aaaef04d0414d0.zip | |
Down-integrate from google internal.
Diffstat (limited to 'python/google/protobuf/pyext/extension_dict.cc')
| -rw-r--r-- | python/google/protobuf/pyext/extension_dict.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/python/google/protobuf/pyext/extension_dict.cc b/python/google/protobuf/pyext/extension_dict.cc index 8ebbb27c..9c9b4178 100644 --- a/python/google/protobuf/pyext/extension_dict.cc +++ b/python/google/protobuf/pyext/extension_dict.cc @@ -123,7 +123,8 @@ PyObject* subscript(ExtensionDict* self, PyObject* key) { if (descriptor->label() == FieldDescriptor::LABEL_REPEATED) { if (descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) { PyObject *message_class = cdescriptor_pool::GetMessageClass( - GetDescriptorPool(), descriptor->message_type()); + cmessage::GetDescriptorPoolForMessage(self->parent), + descriptor->message_type()); if (message_class == NULL) { return NULL; } |