Restoring authorship annotation for <[email protected]>. Commit 2 of 2.

1 files changed, 237 insertions, 237 deletions

diff --git a/contrib/tools/python3/src/Modules/_sqlite/row.c b/contrib/tools/python3/src/Modules/_sqlite/row.c
index 07e7ce9990b..4b47108278a 100644
--- a/contrib/tools/python3/src/Modules/_sqlite/row.c
+++ b/contrib/tools/python3/src/Modules/_sqlite/row.c
@@ -1,81 +1,81 @@
-/* row.c - an enhanced tuple for database rows 
- * 
- * Copyright (C) 2005-2010 Gerhard Häring <[email protected]> 
- * 
- * This file is part of pysqlite. 
- * 
- * This software is provided 'as-is', without any express or implied 
- * warranty.  In no event will the authors be held liable for any damages 
- * arising from the use of this software. 
- * 
- * Permission is granted to anyone to use this software for any purpose, 
- * including commercial applications, and to alter it and redistribute it 
- * freely, subject to the following restrictions: 
- * 
- * 1. The origin of this software must not be misrepresented; you must not 
- *    claim that you wrote the original software. If you use this software 
- *    in a product, an acknowledgment in the product documentation would be 
- *    appreciated but is not required. 
- * 2. Altered source versions must be plainly marked as such, and must not be 
- *    misrepresented as being the original software. 
- * 3. This notice may not be removed or altered from any source distribution. 
- */ 
- 
-#include "row.h" 
-#include "cursor.h" 
- 
-void pysqlite_row_dealloc(pysqlite_Row* self) 
-{ 
-    Py_XDECREF(self->data); 
-    Py_XDECREF(self->description); 
- 
-    Py_TYPE(self)->tp_free((PyObject*)self); 
-} 
- 
-static PyObject * 
-pysqlite_row_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) 
-{ 
-    pysqlite_Row *self; 
-    PyObject* data; 
-    pysqlite_Cursor* cursor; 
- 
-    assert(type != NULL && type->tp_alloc != NULL); 
- 
-    if (!_PyArg_NoKeywords("Row", kwargs)) 
-        return NULL; 
-    if (!PyArg_ParseTuple(args, "OO", &cursor, &data)) 
-        return NULL; 
- 
-    if (!PyObject_TypeCheck((PyObject*)cursor, &pysqlite_CursorType)) { 
-        PyErr_SetString(PyExc_TypeError, "instance of cursor required for first argument"); 
-        return NULL; 
-    } 
- 
-    if (!PyTuple_Check(data)) { 
-        PyErr_SetString(PyExc_TypeError, "tuple required for second argument"); 
-        return NULL; 
-    } 
- 
-    self = (pysqlite_Row *) type->tp_alloc(type, 0); 
-    if (self == NULL) 
-        return NULL; 
- 
-    Py_INCREF(data); 
-    self->data = data; 
- 
-    Py_INCREF(cursor->description); 
-    self->description = cursor->description; 
- 
-    return (PyObject *) self; 
-} 
- 
-PyObject* pysqlite_row_item(pysqlite_Row* self, Py_ssize_t idx) 
-{ 
-   PyObject* item = PyTuple_GetItem(self->data, idx); 
-   Py_XINCREF(item); 
-   return item; 
-} 
- 
+/* row.c - an enhanced tuple for database rows
+ *
+ * Copyright (C) 2005-2010 Gerhard Häring <[email protected]>
+ *
+ * This file is part of pysqlite.
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty.  In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ *    claim that you wrote the original software. If you use this software
+ *    in a product, an acknowledgment in the product documentation would be
+ *    appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#include "row.h"
+#include "cursor.h"
+
+void pysqlite_row_dealloc(pysqlite_Row* self)
+{
+    Py_XDECREF(self->data);
+    Py_XDECREF(self->description);
+
+    Py_TYPE(self)->tp_free((PyObject*)self);
+}
+
+static PyObject *
+pysqlite_row_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
+{
+    pysqlite_Row *self;
+    PyObject* data;
+    pysqlite_Cursor* cursor;
+
+    assert(type != NULL && type->tp_alloc != NULL);
+
+    if (!_PyArg_NoKeywords("Row", kwargs))
+        return NULL;
+    if (!PyArg_ParseTuple(args, "OO", &cursor, &data))
+        return NULL;
+
+    if (!PyObject_TypeCheck((PyObject*)cursor, &pysqlite_CursorType)) {
+        PyErr_SetString(PyExc_TypeError, "instance of cursor required for first argument");
+        return NULL;
+    }
+
+    if (!PyTuple_Check(data)) {
+        PyErr_SetString(PyExc_TypeError, "tuple required for second argument");
+        return NULL;
+    }
+
+    self = (pysqlite_Row *) type->tp_alloc(type, 0);
+    if (self == NULL)
+        return NULL;
+
+    Py_INCREF(data);
+    self->data = data;
+
+    Py_INCREF(cursor->description);
+    self->description = cursor->description;
+
+    return (PyObject *) self;
+}
+
+PyObject* pysqlite_row_item(pysqlite_Row* self, Py_ssize_t idx)
+{
+   PyObject* item = PyTuple_GetItem(self->data, idx);
+   Py_XINCREF(item);
+   return item;
+}
+
 static int
 equal_ignore_case(PyObject *left, PyObject *right)
 {
@@ -104,175 +104,175 @@ equal_ignore_case(PyObject *left, PyObject *right)
     return 1;
 }
 
-PyObject* pysqlite_row_subscript(pysqlite_Row* self, PyObject* idx) 
-{ 
-    Py_ssize_t _idx; 
-    Py_ssize_t nitems, i; 
-    PyObject* item; 
- 
-    if (PyLong_Check(idx)) { 
-        _idx = PyNumber_AsSsize_t(idx, PyExc_IndexError); 
-        if (_idx == -1 && PyErr_Occurred()) 
-            return NULL; 
-        if (_idx < 0) 
-           _idx += PyTuple_GET_SIZE(self->data); 
-        item = PyTuple_GetItem(self->data, _idx); 
-        Py_XINCREF(item); 
-        return item; 
-    } else if (PyUnicode_Check(idx)) { 
-        nitems = PyTuple_Size(self->description); 
- 
-        for (i = 0; i < nitems; i++) { 
-            PyObject *obj; 
-            obj = PyTuple_GET_ITEM(self->description, i); 
-            obj = PyTuple_GET_ITEM(obj, 0); 
+PyObject* pysqlite_row_subscript(pysqlite_Row* self, PyObject* idx)
+{
+    Py_ssize_t _idx;
+    Py_ssize_t nitems, i;
+    PyObject* item;
+
+    if (PyLong_Check(idx)) {
+        _idx = PyNumber_AsSsize_t(idx, PyExc_IndexError);
+        if (_idx == -1 && PyErr_Occurred())
+            return NULL;
+        if (_idx < 0)
+           _idx += PyTuple_GET_SIZE(self->data);
+        item = PyTuple_GetItem(self->data, _idx);
+        Py_XINCREF(item);
+        return item;
+    } else if (PyUnicode_Check(idx)) {
+        nitems = PyTuple_Size(self->description);
+
+        for (i = 0; i < nitems; i++) {
+            PyObject *obj;
+            obj = PyTuple_GET_ITEM(self->description, i);
+            obj = PyTuple_GET_ITEM(obj, 0);
             int eq = equal_ignore_case(idx, obj);
             if (eq < 0) {
-                return NULL; 
-            } 
+                return NULL;
+            }
             if (eq) {
-                /* found item */ 
-                item = PyTuple_GetItem(self->data, i); 
-                Py_INCREF(item); 
-                return item; 
-            } 
-        } 
- 
-        PyErr_SetString(PyExc_IndexError, "No item with that key"); 
-        return NULL; 
-    } 
-    else if (PySlice_Check(idx)) { 
-        return PyObject_GetItem(self->data, idx); 
-    } 
-    else { 
-        PyErr_SetString(PyExc_IndexError, "Index must be int or string"); 
-        return NULL; 
-    } 
-} 
- 
-static Py_ssize_t 
-pysqlite_row_length(pysqlite_Row* self) 
-{ 
-    return PyTuple_GET_SIZE(self->data); 
-} 
- 
+                /* found item */
+                item = PyTuple_GetItem(self->data, i);
+                Py_INCREF(item);
+                return item;
+            }
+        }
+
+        PyErr_SetString(PyExc_IndexError, "No item with that key");
+        return NULL;
+    }
+    else if (PySlice_Check(idx)) {
+        return PyObject_GetItem(self->data, idx);
+    }
+    else {
+        PyErr_SetString(PyExc_IndexError, "Index must be int or string");
+        return NULL;
+    }
+}
+
+static Py_ssize_t
+pysqlite_row_length(pysqlite_Row* self)
+{
+    return PyTuple_GET_SIZE(self->data);
+}
+
 PyObject* pysqlite_row_keys(pysqlite_Row* self, PyObject *Py_UNUSED(ignored))
-{ 
-    PyObject* list; 
-    Py_ssize_t nitems, i; 
- 
-    list = PyList_New(0); 
-    if (!list) { 
-        return NULL; 
-    } 
-    nitems = PyTuple_Size(self->description); 
- 
-    for (i = 0; i < nitems; i++) { 
-        if (PyList_Append(list, PyTuple_GET_ITEM(PyTuple_GET_ITEM(self->description, i), 0)) != 0) { 
-            Py_DECREF(list); 
-            return NULL; 
-        } 
-    } 
- 
-    return list; 
-} 
- 
-static PyObject* pysqlite_iter(pysqlite_Row* self) 
-{ 
-    return PyObject_GetIter(self->data); 
-} 
- 
-static Py_hash_t pysqlite_row_hash(pysqlite_Row *self) 
-{ 
-    return PyObject_Hash(self->description) ^ PyObject_Hash(self->data); 
-} 
- 
-static PyObject* pysqlite_row_richcompare(pysqlite_Row *self, PyObject *_other, int opid) 
-{ 
-    if (opid != Py_EQ && opid != Py_NE) 
-        Py_RETURN_NOTIMPLEMENTED; 
- 
+{
+    PyObject* list;
+    Py_ssize_t nitems, i;
+
+    list = PyList_New(0);
+    if (!list) {
+        return NULL;
+    }
+    nitems = PyTuple_Size(self->description);
+
+    for (i = 0; i < nitems; i++) {
+        if (PyList_Append(list, PyTuple_GET_ITEM(PyTuple_GET_ITEM(self->description, i), 0)) != 0) {
+            Py_DECREF(list);
+            return NULL;
+        }
+    }
+
+    return list;
+}
+
+static PyObject* pysqlite_iter(pysqlite_Row* self)
+{
+    return PyObject_GetIter(self->data);
+}
+
+static Py_hash_t pysqlite_row_hash(pysqlite_Row *self)
+{
+    return PyObject_Hash(self->description) ^ PyObject_Hash(self->data);
+}
+
+static PyObject* pysqlite_row_richcompare(pysqlite_Row *self, PyObject *_other, int opid)
+{
+    if (opid != Py_EQ && opid != Py_NE)
+        Py_RETURN_NOTIMPLEMENTED;
+
     if (PyObject_TypeCheck(_other, &pysqlite_RowType)) {
-        pysqlite_Row *other = (pysqlite_Row *)_other; 
+        pysqlite_Row *other = (pysqlite_Row *)_other;
         int eq = PyObject_RichCompareBool(self->description, other->description, Py_EQ);
         if (eq < 0) {
             return NULL;
         }
         if (eq) {
-            return PyObject_RichCompare(self->data, other->data, opid); 
-        } 
+            return PyObject_RichCompare(self->data, other->data, opid);
+        }
         return PyBool_FromLong(opid != Py_EQ);
-    } 
-    Py_RETURN_NOTIMPLEMENTED; 
-} 
- 
-PyMappingMethods pysqlite_row_as_mapping = { 
-    /* mp_length        */ (lenfunc)pysqlite_row_length, 
-    /* mp_subscript     */ (binaryfunc)pysqlite_row_subscript, 
-    /* mp_ass_subscript */ (objobjargproc)0, 
-}; 
- 
-static PySequenceMethods pysqlite_row_as_sequence = { 
-   /* sq_length */         (lenfunc)pysqlite_row_length, 
-   /* sq_concat */         0, 
-   /* sq_repeat */         0, 
-   /* sq_item */           (ssizeargfunc)pysqlite_row_item, 
-}; 
- 
- 
-static PyMethodDef pysqlite_row_methods[] = { 
-    {"keys", (PyCFunction)pysqlite_row_keys, METH_NOARGS, 
-        PyDoc_STR("Returns the keys of the row.")}, 
-    {NULL, NULL} 
-}; 
- 
- 
-PyTypeObject pysqlite_RowType = { 
-        PyVarObject_HEAD_INIT(NULL, 0) 
-        MODULE_NAME ".Row",                             /* tp_name */ 
-        sizeof(pysqlite_Row),                           /* tp_basicsize */ 
-        0,                                              /* tp_itemsize */ 
-        (destructor)pysqlite_row_dealloc,               /* tp_dealloc */ 
+    }
+    Py_RETURN_NOTIMPLEMENTED;
+}
+
+PyMappingMethods pysqlite_row_as_mapping = {
+    /* mp_length        */ (lenfunc)pysqlite_row_length,
+    /* mp_subscript     */ (binaryfunc)pysqlite_row_subscript,
+    /* mp_ass_subscript */ (objobjargproc)0,
+};
+
+static PySequenceMethods pysqlite_row_as_sequence = {
+   /* sq_length */         (lenfunc)pysqlite_row_length,
+   /* sq_concat */         0,
+   /* sq_repeat */         0,
+   /* sq_item */           (ssizeargfunc)pysqlite_row_item,
+};
+
+
+static PyMethodDef pysqlite_row_methods[] = {
+    {"keys", (PyCFunction)pysqlite_row_keys, METH_NOARGS,
+        PyDoc_STR("Returns the keys of the row.")},
+    {NULL, NULL}
+};
+
+
+PyTypeObject pysqlite_RowType = {
+        PyVarObject_HEAD_INIT(NULL, 0)
+        MODULE_NAME ".Row",                             /* tp_name */
+        sizeof(pysqlite_Row),                           /* tp_basicsize */
+        0,                                              /* tp_itemsize */
+        (destructor)pysqlite_row_dealloc,               /* tp_dealloc */
         0,                                              /* tp_vectorcall_offset */
-        0,                                              /* tp_getattr */ 
-        0,                                              /* tp_setattr */ 
+        0,                                              /* tp_getattr */
+        0,                                              /* tp_setattr */
         0,                                              /* tp_as_async */
-        0,                                              /* tp_repr */ 
-        0,                                              /* tp_as_number */ 
-        0,                                              /* tp_as_sequence */ 
-        0,                                              /* tp_as_mapping */ 
-        (hashfunc)pysqlite_row_hash,                    /* tp_hash */ 
-        0,                                              /* tp_call */ 
-        0,                                              /* tp_str */ 
-        0,                                              /* tp_getattro */ 
-        0,                                              /* tp_setattro */ 
-        0,                                              /* tp_as_buffer */ 
-        Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,         /* tp_flags */ 
-        0,                                              /* tp_doc */ 
-        (traverseproc)0,                                /* tp_traverse */ 
-        0,                                              /* tp_clear */ 
-        (richcmpfunc)pysqlite_row_richcompare,          /* tp_richcompare */ 
-        0,                                              /* tp_weaklistoffset */ 
-        (getiterfunc)pysqlite_iter,                     /* tp_iter */ 
-        0,                                              /* tp_iternext */ 
-        pysqlite_row_methods,                           /* tp_methods */ 
-        0,                                              /* tp_members */ 
-        0,                                              /* tp_getset */ 
-        0,                                              /* tp_base */ 
-        0,                                              /* tp_dict */ 
-        0,                                              /* tp_descr_get */ 
-        0,                                              /* tp_descr_set */ 
-        0,                                              /* tp_dictoffset */ 
-        0,                                              /* tp_init */ 
-        0,                                              /* tp_alloc */ 
-        0,                                              /* tp_new */ 
-        0                                               /* tp_free */ 
-}; 
- 
-extern int pysqlite_row_setup_types(void) 
-{ 
-    pysqlite_RowType.tp_new = pysqlite_row_new; 
-    pysqlite_RowType.tp_as_mapping = &pysqlite_row_as_mapping; 
-    pysqlite_RowType.tp_as_sequence = &pysqlite_row_as_sequence; 
-    return PyType_Ready(&pysqlite_RowType); 
-} 
+        0,                                              /* tp_repr */
+        0,                                              /* tp_as_number */
+        0,                                              /* tp_as_sequence */
+        0,                                              /* tp_as_mapping */
+        (hashfunc)pysqlite_row_hash,                    /* tp_hash */
+        0,                                              /* tp_call */
+        0,                                              /* tp_str */
+        0,                                              /* tp_getattro */
+        0,                                              /* tp_setattro */
+        0,                                              /* tp_as_buffer */
+        Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,         /* tp_flags */
+        0,                                              /* tp_doc */
+        (traverseproc)0,                                /* tp_traverse */
+        0,                                              /* tp_clear */
+        (richcmpfunc)pysqlite_row_richcompare,          /* tp_richcompare */
+        0,                                              /* tp_weaklistoffset */
+        (getiterfunc)pysqlite_iter,                     /* tp_iter */
+        0,                                              /* tp_iternext */
+        pysqlite_row_methods,                           /* tp_methods */
+        0,                                              /* tp_members */
+        0,                                              /* tp_getset */
+        0,                                              /* tp_base */
+        0,                                              /* tp_dict */
+        0,                                              /* tp_descr_get */
+        0,                                              /* tp_descr_set */
+        0,                                              /* tp_dictoffset */
+        0,                                              /* tp_init */
+        0,                                              /* tp_alloc */
+        0,                                              /* tp_new */
+        0                                               /* tp_free */
+};
+
+extern int pysqlite_row_setup_types(void)
+{
+    pysqlite_RowType.tp_new = pysqlite_row_new;
+    pysqlite_RowType.tp_as_mapping = &pysqlite_row_as_mapping;
+    pysqlite_RowType.tp_as_sequence = &pysqlite_row_as_sequence;
+    return PyType_Ready(&pysqlite_RowType);
+}