Skip to content

[CURA-13047] 'findFieldByName' now gives null on Windows, but the name exists #16

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

Open
rburema wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[CURA-13047] 'findFieldByName' now gives null on Windows, but the name exists #16

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
28 changes: 21 additions & 7 deletions src/PythonMessage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,29 @@ MessagePtr Arcus::PythonMessage::getSharedMessage() const
return _shared_message;
}

// Instead of `_descriptor->FindFieldByName(field_name)`.
const google::protobuf::FieldDescriptor* findFieldByNameHack(const google::protobuf::Descriptor* _descriptor, const std::string_view field_name)
{
for (int ii = 0; ii < _descriptor->field_count(); ++ii)
{
auto candidate = _descriptor->field(ii);
if (field_name.compare(candidate->name()) == 0)
{
return candidate;
}
}
return nullptr;
}

bool Arcus::PythonMessage::__hasattr__(const std::string& field_name) const
{
auto field = _descriptor->FindFieldByName(field_name);
auto field = findFieldByNameHack(_descriptor, field_name);
return bool(field);
}

PyObject* Arcus::PythonMessage::__getattr__(const std::string& field_name) const
{
auto field = _descriptor->FindFieldByName(field_name);
auto field = findFieldByNameHack(_descriptor, field_name);
if (! field)
{
PyErr_SetString(PyExc_AttributeError, field_name.c_str());
Expand Down Expand Up @@ -101,7 +115,7 @@ PyObject* Arcus::PythonMessage::__getattr__(const std::string& field_name) const

void Arcus::PythonMessage::__setattr__(const std::string& field_name, PyObject* value)
{
auto field = _descriptor->FindFieldByName(field_name);
auto field = findFieldByNameHack(_descriptor, field_name);
if (! field)
{
PyErr_SetString(PyExc_AttributeError, field_name.c_str());
Expand Down Expand Up @@ -177,7 +191,7 @@ void Arcus::PythonMessage::__setattr__(const std::string& field_name, PyObject*

PythonMessage* Arcus::PythonMessage::addRepeatedMessage(const std::string& field_name)
{
auto field = _descriptor->FindFieldByName(field_name);
auto field = findFieldByNameHack(_descriptor, field_name);
if (! field)
{
PyErr_SetString(PyExc_AttributeError, field_name.c_str());
Expand All @@ -190,7 +204,7 @@ PythonMessage* Arcus::PythonMessage::addRepeatedMessage(const std::string& field

int PythonMessage::repeatedMessageCount(const std::string& field_name) const
{
auto field = _descriptor->FindFieldByName(field_name);
auto field = findFieldByNameHack(_descriptor, field_name);
if (! field)
{
PyErr_SetString(PyExc_AttributeError, field_name.c_str());
Expand All @@ -202,7 +216,7 @@ int PythonMessage::repeatedMessageCount(const std::string& field_name) const

PythonMessage* Arcus::PythonMessage::getMessage(const std::string& field_name)
{
auto field = _descriptor->FindFieldByName(field_name);
auto field = findFieldByNameHack(_descriptor, field_name);
if (! field)
{
PyErr_SetString(PyExc_AttributeError, field_name.c_str());
Expand All @@ -213,7 +227,7 @@ PythonMessage* Arcus::PythonMessage::getMessage(const std::string& field_name)

PythonMessage* Arcus::PythonMessage::getRepeatedMessage(const std::string& field_name, int index)
{
auto field = _descriptor->FindFieldByName(field_name);
auto field = findFieldByNameHack(_descriptor, field_name);
if (! field)
{
PyErr_SetString(PyExc_AttributeError, field_name.c_str());
Expand Down
Loading