aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/python
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.ru>2022-06-16 13:27:22 +0300
committerthegeorg <thegeorg@yandex-team.ru>2022-06-16 13:27:22 +0300
commitecf080194ff9dbff607508d20afaaba010bc18c3 (patch)
treebc0f2ddc3d104b151091f67a29f9c8318a7a1d37 /contrib/python
parent41a4072e2874fa50b329c8b07a8e815fcd9ec3d6 (diff)
downloadydb-ecf080194ff9dbff607508d20afaaba010bc18c3.tar.gz
Remove protobuf patch as it does nothing
Also bump nixpkgs revision in both protobufs. ref:cf53af88fa34b1a2f8cf6ce41ba0ca68fa616c50
Diffstat (limited to 'contrib/python')
-rw-r--r--contrib/python/protobuf/py3/google/protobuf/pyext/message.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/contrib/python/protobuf/py3/google/protobuf/pyext/message.cc b/contrib/python/protobuf/py3/google/protobuf/pyext/message.cc
index a9e464d7f95..291af9e817e 100644
--- a/contrib/python/protobuf/py3/google/protobuf/pyext/message.cc
+++ b/contrib/python/protobuf/py3/google/protobuf/pyext/message.cc
@@ -822,7 +822,6 @@ bool CheckAndSetString(
PyObject* ToStringObject(const FieldDescriptor* descriptor,
const TProtoStringType& value) {
-#if PY_MAJOR_VERSION >= 3
if (descriptor->type() != FieldDescriptor::TYPE_STRING) {
return PyBytes_FromStringAndSize(value.c_str(), value.length());
}
@@ -837,9 +836,6 @@ PyObject* ToStringObject(const FieldDescriptor* descriptor,
result = PyBytes_FromStringAndSize(value.c_str(), value.length());
}
return result;
-#else
- return PyBytes_FromStringAndSize(value.c_str(), value.length());
-#endif
}
bool CheckFieldBelongsToMessage(const FieldDescriptor* field_descriptor,