Restoring authorship annotation for <spreis@yandex-team.ru>. Commit 1 of 2.

1 files changed, 17 insertions, 17 deletions

diff --git a/contrib/python/protobuf/py3/google/protobuf/pyext/message.cc b/contrib/python/protobuf/py3/google/protobuf/pyext/message.cc
index 8b41ca47dd..3ee9b2664a 100644
--- a/contrib/python/protobuf/py3/google/protobuf/pyext/message.cc
+++ b/contrib/python/protobuf/py3/google/protobuf/pyext/message.cc
@@ -806,24 +806,24 @@ 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());
-  }
-
-  PyObject* result = PyUnicode_DecodeUTF8(value.c_str(), value.length(), NULL);
-  // If the string can't be decoded in UTF-8, just return a string object that
-  // contains the raw bytes. This can't happen if the value was assigned using
-  // the members of the Python message object, but can happen if the values were
-  // parsed from the wire (binary).
-  if (result == NULL) {
-    PyErr_Clear();
-    result = PyBytes_FromStringAndSize(value.c_str(), value.length());
-  }
-  return result;
-#else
+#if PY_MAJOR_VERSION >= 3 
+  if (descriptor->type() != FieldDescriptor::TYPE_STRING) { 
+    return PyBytes_FromStringAndSize(value.c_str(), value.length()); 
+  } 
+
+  PyObject* result = PyUnicode_DecodeUTF8(value.c_str(), value.length(), NULL); 
+  // If the string can't be decoded in UTF-8, just return a string object that 
+  // contains the raw bytes. This can't happen if the value was assigned using 
+  // the members of the Python message object, but can happen if the values were 
+  // parsed from the wire (binary). 
+  if (result == NULL) { 
+    PyErr_Clear(); 
+    result = PyBytes_FromStringAndSize(value.c_str(), value.length()); 
+  } 
+  return result; 
+#else 
   return PyBytes_FromStringAndSize(value.c_str(), value.length());
-#endif
+#endif 
 }
 
 bool CheckFieldBelongsToMessage(const FieldDescriptor* field_descriptor,