Skip to content
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

Automated Code Change #177

Merged
merged 1 commit into from
Sep 16, 2024
Merged

Automated Code Change #177

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
18 changes: 10 additions & 8 deletions pybind11_protobuf/proto_cast_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ namespace {
// Resolves the class name of a descriptor via d->containing_type()
py::object ResolveDescriptor(py::object p, const Descriptor* d) {
return d->containing_type() ? ResolveDescriptor(p, d->containing_type())
.attr(d->name().c_str())
: p.attr(d->name().c_str());
.attr(py::str(d->name()))
: p.attr(py::str(d->name()));
}

// Returns true if an exception is an import error.
Expand Down Expand Up @@ -266,10 +266,11 @@ py::object GlobalState::PyMessageInstance(const Descriptor* descriptor) {
}
}

throw py::type_error("Cannot construct a protocol buffer message type " +
descriptor->full_name() +
" in python. Is there a missing dependency on module " +
module_name + "?");
throw py::type_error(
absl::StrCat("Cannot construct a protocol buffer message type ",
descriptor->full_name(),
" in python. Is there a missing dependency on module ",
module_name, "?"));
}

// Create C++ DescriptorPools based on Python DescriptorPools.
Expand Down Expand Up @@ -525,8 +526,9 @@ void CProtoCopyToPyProto(Message* message, py::handle py_proto) {
assert(PyGILState_Check());
auto merge_fn = ResolveAttrMRO(py_proto, "MergeFromString");
if (!merge_fn) {
throw py::type_error("MergeFromString method not found; is this a " +
message->GetDescriptor()->full_name());
throw py::type_error(
absl::StrCat("MergeFromString method not found; is this a ",
message->GetDescriptor()->full_name()));
}

auto serialized = message->SerializePartialAsString();
Expand Down
Loading