Reverts third_party/protobuf: Update to HEAD (f52e188fe4)

third_party/protobuf/python/google/protobuf/pyext/descriptor_containers.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 590 matching lines @@
   if (index < 0) {
     index += Length(self);
   }
   if (index < 0 || index >= Length(self)) {
     PyErr_SetString(PyExc_IndexError, "index out of range");
     return NULL;
   }
   return _NewObj_ByIndex(self, index);
 }
 
-static PyObject *
-SeqSubscript(PyContainer* self, PyObject* item) {
-  if (PyIndex_Check(item)) {
-      Py_ssize_t index;
-      index = PyNumber_AsSsize_t(item, PyExc_IndexError);
-      if (index == -1 && PyErr_Occurred())
-          return NULL;
-      return GetItem(self, index);
-  }
-  // Materialize the list and delegate the operation to it.
-  ScopedPyObjectPtr list(PyObject_CallFunctionObjArgs(
-      reinterpret_cast<PyObject*>(&PyList_Type), self, NULL));
-  if (list == NULL) {
-    return NULL;
-  }
-  return Py_TYPE(list.get())->tp_as_mapping->mp_subscript(list.get(), item);
-}
-
 // Returns the position of the item in the sequence, of -1 if not found.
 // This function never fails.
 int Find(PyContainer* self, PyObject* item) {
   // The item can only be in one position: item.index.
   // Check that self[item.index] == item, it's faster than a linear search.
   //
   // This assumes that sequences are only defined by syntax of the .proto file:
   // a specific item belongs to only one sequence, depending on its position in
   // the .proto file definition.
   const void* descriptor_ptr = PyDescriptor_AsVoidPtr(item);
@@ skipping 75 matching lines @@
 
 static PyMethodDef SeqMethods[] = {
   { "index", (PyCFunction)Index, METH_O, },
   { "count", (PyCFunction)Count, METH_O, },
   { "append", (PyCFunction)Append, METH_O, },
   { "__reversed__", (PyCFunction)Reversed, METH_NOARGS, },
   {NULL}
 };
 
 static PySequenceMethods SeqSequenceMethods = {
-  (lenfunc)Length,          // sq_length
-  0,                        // sq_concat
-  0,                        // sq_repeat
-  (ssizeargfunc)GetItem,    // sq_item
-  0,                        // sq_slice
-  0,                        // sq_ass_item
-  0,                        // sq_ass_slice
-  (objobjproc)SeqContains,  // sq_contains
-};
-
-static PyMappingMethods SeqMappingMethods = {
-  (lenfunc)Length,           // mp_length
-  (binaryfunc)SeqSubscript,  // mp_subscript
-  0,                         // mp_ass_subscript
+    (lenfunc)Length,          // sq_length
+    0,                        // sq_concat
+    0,                        // sq_repeat
+    (ssizeargfunc)GetItem,    // sq_item
+    0,                        // sq_slice
+    0,                        // sq_ass_item
+    0,                        // sq_ass_slice
+    (objobjproc)SeqContains,  // sq_contains
 };
 
 PyTypeObject DescriptorSequence_Type = {
   PyVarObject_HEAD_INIT(&PyType_Type, 0)
   "DescriptorSequence",                 // tp_name
   sizeof(PyContainer),                  // tp_basicsize
   0,                                    // tp_itemsize
   0,                                    // tp_dealloc
   0,                                    // tp_print
   0,                                    // tp_getattr
   0,                                    // tp_setattr
   0,                                    // tp_compare
   (reprfunc)ContainerRepr,              // tp_repr
   0,                                    // tp_as_number
   &SeqSequenceMethods,                  // tp_as_sequence
-  &SeqMappingMethods,                   // tp_as_mapping
+  0,                                    // tp_as_mapping
   0,                                    // tp_hash
   0,                                    // tp_call
   0,                                    // tp_str
   0,                                    // tp_getattro
   0,                                    // tp_setattro
   0,                                    // tp_as_buffer
   Py_TPFLAGS_DEFAULT,                   // tp_flags
   0,                                    // tp_doc
   0,                                    // tp_traverse
   0,                                    // tp_clear
@@ skipping 660 matching lines @@
 };
 
 }  // namespace fields
 
 PyObject* NewOneofFieldsSeq(ParentDescriptor descriptor) {
   return descriptor::NewSequence(&fields::ContainerDef, descriptor);
 }
 
 }  // namespace oneof_descriptor
 
-namespace service_descriptor {
-
-typedef const ServiceDescriptor* ParentDescriptor;
-
-static ParentDescriptor GetDescriptor(PyContainer* self) {
-  return reinterpret_cast<ParentDescriptor>(self->descriptor);
-}
-
-namespace methods {
-
-typedef const MethodDescriptor* ItemDescriptor;
-
-static int Count(PyContainer* self) {
-  return GetDescriptor(self)->method_count();
-}
-
-static ItemDescriptor GetByName(PyContainer* self, const string& name) {
-  return GetDescriptor(self)->FindMethodByName(name);
-}
-
-static ItemDescriptor GetByIndex(PyContainer* self, int index) {
-  return GetDescriptor(self)->method(index);
-}
-
-static PyObject* NewObjectFromItem(ItemDescriptor item) {
-  return PyMethodDescriptor_FromDescriptor(item);
-}
-
-static const string& GetItemName(ItemDescriptor item) {
-  return item->name();
-}
-
-static int GetItemIndex(ItemDescriptor item) {
-  return item->index();
-}
-
-static DescriptorContainerDef ContainerDef = {
-  "ServiceMethods",
-  (CountMethod)Count,
-  (GetByIndexMethod)GetByIndex,
-  (GetByNameMethod)GetByName,
-  (GetByCamelcaseNameMethod)NULL,
-  (GetByNumberMethod)NULL,
-  (NewObjectFromItemMethod)NewObjectFromItem,
-  (GetItemNameMethod)GetItemName,
-  (GetItemCamelcaseNameMethod)NULL,
-  (GetItemNumberMethod)NULL,
-  (GetItemIndexMethod)GetItemIndex,
-};
-
-}  // namespace methods
-
-PyObject* NewServiceMethodsSeq(ParentDescriptor descriptor) {
-  return descriptor::NewSequence(&methods::ContainerDef, descriptor);
-}
-
-PyObject* NewServiceMethodsByName(ParentDescriptor descriptor) {
-  return descriptor::NewMappingByName(&methods::ContainerDef, descriptor);
-}
-
-}  // namespace service_descriptor
-
 namespace file_descriptor {
 
 typedef const FileDescriptor* ParentDescriptor;
 
 static ParentDescriptor GetDescriptor(PyContainer* self) {
   return reinterpret_cast<ParentDescriptor>(self->descriptor);
 }
 
 namespace messages {
 
@@ skipping 32 matching lines @@
   (GetByNumberMethod)NULL,
   (NewObjectFromItemMethod)NewObjectFromItem,
   (GetItemNameMethod)GetItemName,
   (GetItemCamelcaseNameMethod)NULL,
   (GetItemNumberMethod)NULL,
   (GetItemIndexMethod)GetItemIndex,
 };
 
 }  // namespace messages
 
-PyObject* NewFileMessageTypesByName(ParentDescriptor descriptor) {
+PyObject* NewFileMessageTypesByName(const FileDescriptor* descriptor) {
   return descriptor::NewMappingByName(&messages::ContainerDef, descriptor);
 }
 
 namespace enums {
 
 typedef const EnumDescriptor* ItemDescriptor;
 
 static int Count(PyContainer* self) {
   return GetDescriptor(self)->enum_type_count();
 }
@@ skipping 27 matching lines @@
   (GetByNumberMethod)NULL,
   (NewObjectFromItemMethod)NewObjectFromItem,
   (GetItemNameMethod)GetItemName,
   (GetItemCamelcaseNameMethod)NULL,
   (GetItemNumberMethod)NULL,
   (GetItemIndexMethod)GetItemIndex,
 };
 
 }  // namespace enums
 
-PyObject* NewFileEnumTypesByName(ParentDescriptor descriptor) {
+PyObject* NewFileEnumTypesByName(const FileDescriptor* descriptor) {
   return descriptor::NewMappingByName(&enums::ContainerDef, descriptor);
 }
 
 namespace extensions {
 
 typedef const FieldDescriptor* ItemDescriptor;
 
 static int Count(PyContainer* self) {
   return GetDescriptor(self)->extension_count();
 }
@@ skipping 27 matching lines @@
   (GetByNumberMethod)NULL,
   (NewObjectFromItemMethod)NewObjectFromItem,
   (GetItemNameMethod)GetItemName,
   (GetItemCamelcaseNameMethod)NULL,
   (GetItemNumberMethod)NULL,
   (GetItemIndexMethod)GetItemIndex,
 };
 
 }  // namespace extensions
 
-PyObject* NewFileExtensionsByName(ParentDescriptor descriptor) {
+PyObject* NewFileExtensionsByName(const FileDescriptor* descriptor) {
   return descriptor::NewMappingByName(&extensions::ContainerDef, descriptor);
 }
 
-namespace services {
-
-typedef const ServiceDescriptor* ItemDescriptor;
-
-static int Count(PyContainer* self) {
-  return GetDescriptor(self)->service_count();
-}
-
-static ItemDescriptor GetByName(PyContainer* self, const string& name) {
-  return GetDescriptor(self)->FindServiceByName(name);
-}
-
-static ItemDescriptor GetByIndex(PyContainer* self, int index) {
-  return GetDescriptor(self)->service(index);
-}
-
-static PyObject* NewObjectFromItem(ItemDescriptor item) {
-  return PyServiceDescriptor_FromDescriptor(item);
-}
-
-static const string& GetItemName(ItemDescriptor item) {
-  return item->name();
-}
-
-static int GetItemIndex(ItemDescriptor item) {
-  return item->index();
-}
-
-static DescriptorContainerDef ContainerDef = {
-  "FileServices",
-  (CountMethod)Count,
-  (GetByIndexMethod)GetByIndex,
-  (GetByNameMethod)GetByName,
-  (GetByCamelcaseNameMethod)NULL,
-  (GetByNumberMethod)NULL,
-  (NewObjectFromItemMethod)NewObjectFromItem,
-  (GetItemNameMethod)GetItemName,
-  (GetItemCamelcaseNameMethod)NULL,
-  (GetItemNumberMethod)NULL,
-  (GetItemIndexMethod)GetItemIndex,
-};
-
-}  // namespace services
-
-PyObject* NewFileServicesByName(const FileDescriptor* descriptor) {
-  return descriptor::NewMappingByName(&services::ContainerDef, descriptor);
-}
-
 namespace dependencies {
 
 typedef const FileDescriptor* ItemDescriptor;
 
 static int Count(PyContainer* self) {
   return GetDescriptor(self)->dependency_count();
 }
 
 static ItemDescriptor GetByIndex(PyContainer* self, int index) {
   return GetDescriptor(self)->dependency(index);
@@ skipping 71 matching lines @@
   if (PyType_Ready(&descriptor::DescriptorSequence_Type) < 0)
     return false;
   if (PyType_Ready(&descriptor::ContainerIterator_Type) < 0)
     return false;
   return true;
 }
 
 }  // namespace python
 }  // namespace protobuf
 }  // namespace google