Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/python/google/protobuf/pyext/repeated_composite_container.cc

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 128 matching lines @@
   Message* sub_message =
       message->GetReflection()->AddMessage(message,
                                            self->parent_field_descriptor);
   CMessage* cmsg = cmessage::NewEmptyMessage(self->child_message_class);
   if (cmsg == NULL)
     return NULL;
 
   cmsg->owner = self->owner;
   cmsg->message = sub_message;
   cmsg->parent = self->parent;
-  if (cmessage::InitAttributes(cmsg, args, kwargs) < 0) {
+  if (cmessage::InitAttributes(cmsg, kwargs) < 0) {
     Py_DECREF(cmsg);
     return NULL;
   }
 
   PyObject* py_cmsg = reinterpret_cast<PyObject*>(cmsg);
   if (PyList_Append(self->child_messages, py_cmsg) < 0) {
     Py_DECREF(py_cmsg);
     return NULL;
   }
   return py_cmsg;
 }
 
 static PyObject* AddToReleased(RepeatedCompositeContainer* self,
                                PyObject* args,
                                PyObject* kwargs) {
   GOOGLE_CHECK_RELEASED(self);
 
   // Create a new Message detached from the rest.
   PyObject* py_cmsg = PyEval_CallObjectWithKeywords(
-      self->child_message_class->AsPyObject(), args, kwargs);
+      self->child_message_class->AsPyObject(), NULL, kwargs);
   if (py_cmsg == NULL)
     return NULL;
 
   if (PyList_Append(self->child_messages, py_cmsg) < 0) {
     Py_DECREF(py_cmsg);
     return NULL;
   }
   return py_cmsg;
 }
 
@@ skipping 177 matching lines @@
 }
 
 // Returns 0 if successful; returns -1 and sets an exception if
 // unsuccessful.
 static int SortPythonMessages(RepeatedCompositeContainer* self,
                                PyObject* args,
                                PyObject* kwds) {
   ScopedPyObjectPtr m(PyObject_GetAttrString(self->child_messages, "sort"));
   if (m == NULL)
     return -1;
-  if (ScopedPyObjectPtr(PyObject_Call(m.get(), args, kwds)) == NULL)
+  if (PyObject_Call(m.get(), args, kwds) == NULL)
     return -1;
   if (self->message != NULL) {
     ReorderAttached(self);
   }
   return 0;
 }
 
 static PyObject* Sort(RepeatedCompositeContainer* self,
                       PyObject* args,
                       PyObject* kwds) {
@@ skipping 225 matching lines @@
   0,                                   //  tp_dict
   0,                                   //  tp_descr_get
   0,                                   //  tp_descr_set
   0,                                   //  tp_dictoffset
   0,                                   //  tp_init
 };
 
 }  // namespace python
 }  // namespace protobuf
 }  // namespace google