From ecf080194ff9dbff607508d20afaaba010bc18c3 Mon Sep 17 00:00:00 2001 From: thegeorg Date: Thu, 16 Jun 2022 13:27:22 +0300 Subject: Remove protobuf patch as it does nothing Also bump nixpkgs revision in both protobufs. ref:cf53af88fa34b1a2f8cf6ce41ba0ca68fa616c50 --- contrib/python/protobuf/py3/google/protobuf/pyext/message.cc | 4 ---- 1 file changed, 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, -- cgit v1.3