Skip to content

Automated Code Change #22587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −3
Draft

Automated Code Change #22587

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions python/google/protobuf/pyext/extension_dict.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ PyObject* subscript(ExtensionDict* self, PyObject* key) {
return nullptr;
}

if (descriptor->label() != FieldDescriptor::LABEL_REPEATED &&
if (!descriptor->is_repeated() &&
descriptor->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) {
return cmessage::InternalGetScalar(self->parent->message, descriptor);
}
Expand All @@ -130,7 +130,7 @@ PyObject* subscript(ExtensionDict* self, PyObject* key) {
return iterator->second->AsPyObject();
}

if (descriptor->label() != FieldDescriptor::LABEL_REPEATED &&
if (!descriptor->is_repeated() &&
descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
// TODO: consider building the class on the fly!
ContainerBase* sub_message =
Expand All @@ -142,7 +142,7 @@ PyObject* subscript(ExtensionDict* self, PyObject* key) {
return sub_message->AsPyObject();
}

if (descriptor->label() == FieldDescriptor::LABEL_REPEATED) {
if (descriptor->is_repeated()) {
if (descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
// On the fly message class creation is needed to support the following
// situation:
Expand Down
Loading