Changeset 391 for python/trunk/Modules/operator.c

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Modules/operator.c (modified) (36 diffs)

python/trunk/Modules/operator.c

@@ -8 +8 @@
 to the intrinsic operators of Python.  For example, operator.add(x, y)\n\
 is equivalent to the expression x+y.  The function names are those\n\
-used for special class methods; variants without leading and trailing\n\
+used for special methods; variants without leading and trailing\n\
 '__' are also provided for convenience.");
 
@@ -66 +66 @@
   return PyObject_RichCompare(a1,a2,A); }
 
-spami(isCallable       , PyCallable_Check)
+/* Deprecated operators that need warnings. */
+static int
+op_isCallable(PyObject *x)
+{
+    if (PyErr_WarnPy3k("operator.isCallable() is not supported in 3.x. "
+                       "Use hasattr(obj, '__call__').", 1) < 0)
+        return -1;
+    return PyCallable_Check(x);
+}
+
+static int
+op_sequenceIncludes(PyObject *seq, PyObject* ob)
+{
+    if (PyErr_WarnPy3k("operator.sequenceIncludes() is not supported "
+                       "in 3.x. Use operator.contains().", 1) < 0)
+        return -1;
+    return PySequence_Contains(seq, ob);
+}
+
+spami(isCallable       , op_isCallable)
 spami(isNumberType     , PyNumber_Check)
 spami(truth            , PyObject_IsTrue)
@@ -105 +124 @@
 spamoi(op_irepeat      , PySequence_InPlaceRepeat)
 spami2b(op_contains     , PySequence_Contains)
-spami2b(sequenceIncludes, PySequence_Contains)
+spami2b(sequenceIncludes, op_sequenceIncludes)
 spamn2(indexOf         , PySequence_Index)
 spamn2(countOf         , PySequence_Count)
@@ -122 +141 @@
 op_pow(PyObject *s, PyObject *a)
 {
-        PyObject *a1, *a2;
-        if (PyArg_UnpackTuple(a,"pow", 2, 2, &a1, &a2))
-                return PyNumber_Power(a1, a2, Py_None);
-        return NULL;
+    PyObject *a1, *a2;
+    if (PyArg_UnpackTuple(a,"pow", 2, 2, &a1, &a2))
+        return PyNumber_Power(a1, a2, Py_None);
+    return NULL;
 }
 
@@ -131 +150 @@
 op_ipow(PyObject *s, PyObject *a)
 {
-        PyObject *a1, *a2;
-        if (PyArg_UnpackTuple(a,"ipow", 2, 2, &a1, &a2))
-                return PyNumber_InPlacePower(a1, a2, Py_None);
-        return NULL;
+    PyObject *a1, *a2;
+    if (PyArg_UnpackTuple(a,"ipow", 2, 2, &a1, &a2))
+        return PyNumber_InPlacePower(a1, a2, Py_None);
+    return NULL;
 }
 
@@ -140 +159 @@
 op_index(PyObject *s, PyObject *a)
 {
-        return PyNumber_Index(a);
+    return PyNumber_Index(a);
 }
 
@@ -146 +165 @@
 is_(PyObject *s, PyObject *a)
 {
-        PyObject *a1, *a2, *result = NULL;
-        if (PyArg_UnpackTuple(a,"is_", 2, 2, &a1, &a2)) {
-                result = (a1 == a2) ? Py_True : Py_False;
-                Py_INCREF(result);
-        }
-        return result;
+    PyObject *a1, *a2, *result = NULL;
+    if (PyArg_UnpackTuple(a,"is_", 2, 2, &a1, &a2)) {
+        result = (a1 == a2) ? Py_True : Py_False;
+        Py_INCREF(result);
+    }
+    return result;
 }
 
@@ -157 +176 @@
 is_not(PyObject *s, PyObject *a)
 {
-        PyObject *a1, *a2, *result = NULL;
-        if (PyArg_UnpackTuple(a,"is_not", 2, 2, &a1, &a2)) {
-                result = (a1 != a2) ? Py_True : Py_False;
-                Py_INCREF(result);
-        }
-        return result;
+    PyObject *a1, *a2, *result = NULL;
+    if (PyArg_UnpackTuple(a,"is_not", 2, 2, &a1, &a2)) {
+        result = (a1 != a2) ? Py_True : Py_False;
+        Py_INCREF(result);
+    }
+    return result;
 }
 
@@ -168 +187 @@
 op_getslice(PyObject *s, PyObject *a)
 {
-        PyObject *a1;
-        Py_ssize_t a2, a3;
-
-        if (!PyArg_ParseTuple(a, "Onn:getslice", &a1, &a2, &a3))
-                return NULL;
-        return PySequence_GetSlice(a1, a2, a3);
+    PyObject *a1;
+    Py_ssize_t a2, a3;
+
+    if (!PyArg_ParseTuple(a, "Onn:getslice", &a1, &a2, &a3))
+        return NULL;
+    return PySequence_GetSlice(a1, a2, a3);
 }
 
@@ -179 +198 @@
 op_setslice(PyObject *s, PyObject *a)
 {
-        PyObject *a1, *a4;
-        Py_ssize_t a2, a3;
-
-        if (!PyArg_ParseTuple(a, "OnnO:setslice", &a1, &a2, &a3, &a4))
-                return NULL;
-
-        if (-1 == PySequence_SetSlice(a1, a2, a3, a4))
-                return NULL;
-
-        Py_RETURN_NONE;
+    PyObject *a1, *a4;
+    Py_ssize_t a2, a3;
+
+    if (!PyArg_ParseTuple(a, "OnnO:setslice", &a1, &a2, &a3, &a4))
+        return NULL;
+
+    if (-1 == PySequence_SetSlice(a1, a2, a3, a4))
+        return NULL;
+
+    Py_RETURN_NONE;
 }
 
@@ -194 +213 @@
 op_delslice(PyObject *s, PyObject *a)
 {
-        PyObject *a1;
-        Py_ssize_t a2, a3;
-
-        if (!PyArg_ParseTuple(a, "Onn:delslice", &a1, &a2, &a3))
-                return NULL;
-
-        if (-1 == PySequence_DelSlice(a1, a2, a3))
-                return NULL;
-
-        Py_RETURN_NONE;
+    PyObject *a1;
+    Py_ssize_t a2, a3;
+
+    if (!PyArg_ParseTuple(a, "Onn:delslice", &a1, &a2, &a3))
+        return NULL;
+
+    if (-1 == PySequence_DelSlice(a1, a2, a3))
+        return NULL;
+
+    Py_RETURN_NONE;
 }
 
@@ -212 +231 @@
 #define spam1(OP,DOC) {#OP, OP, METH_VARARGS, PyDoc_STR(DOC)},
 #define spam2(OP,ALTOP,DOC) {#OP, op_##OP, METH_VARARGS, PyDoc_STR(DOC)}, \
-                           {#ALTOP, op_##OP, METH_VARARGS, PyDoc_STR(DOC)}, 
+                           {#ALTOP, op_##OP, METH_VARARGS, PyDoc_STR(DOC)},
 #define spam1o(OP,DOC) {#OP, OP, METH_O, PyDoc_STR(DOC)},
 #define spam2o(OP,ALTOP,DOC) {#OP, op_##OP, METH_O, PyDoc_STR(DOC)}, \
-                           {#ALTOP, op_##OP, METH_O, PyDoc_STR(DOC)}, 
+                           {#ALTOP, op_##OP, METH_O, PyDoc_STR(DOC)},
 
 static struct PyMethodDef operator_methods[] = {
@@ -259 +278 @@
 spam2(xor,__xor__, "xor(a, b) -- Same as a ^ b.")
 spam2(or_,__or__, "or_(a, b) -- Same as a | b.")
-spam2(iadd,__iadd__, "iadd(a, b) -- Same as a += b.")
-spam2(isub,__isub__, "isub(a, b) -- Same as a -= b.")
-spam2(imul,__imul__, "imul(a, b) -- Same as a *= b.")
-spam2(idiv,__idiv__, "idiv(a, b) -- Same as a /= b when __future__.division is not in effect.")
-spam2(ifloordiv,__ifloordiv__, "ifloordiv(a, b) -- Same as a //= b.")
-spam2(itruediv,__itruediv__, "itruediv(a, b) -- Same as a /= b when __future__.division is in effect.")
-spam2(imod,__imod__, "imod(a, b) -- Same as a %= b.")
-spam2(ilshift,__ilshift__, "ilshift(a, b) -- Same as a <<= b.")
-spam2(irshift,__irshift__, "irshift(a, b) -- Same as a >>= b.")
-spam2(iand,__iand__, "iand(a, b) -- Same as a &= b.")
-spam2(ixor,__ixor__, "ixor(a, b) -- Same as a ^= b.")
-spam2(ior,__ior__, "ior(a, b) -- Same as a |= b.")
+spam2(iadd,__iadd__, "a = iadd(a, b) -- Same as a += b.")
+spam2(isub,__isub__, "a = isub(a, b) -- Same as a -= b.")
+spam2(imul,__imul__, "a = imul(a, b) -- Same as a *= b.")
+spam2(idiv,__idiv__, "a = idiv(a, b) -- Same as a /= b when __future__.division is not in effect.")
+spam2(ifloordiv,__ifloordiv__, "a = ifloordiv(a, b) -- Same as a //= b.")
+spam2(itruediv,__itruediv__, "a = itruediv(a, b) -- Same as a /= b when __future__.division is in effect.")
+spam2(imod,__imod__, "a = imod(a, b) -- Same as a %= b.")
+spam2(ilshift,__ilshift__, "a = ilshift(a, b) -- Same as a <<= b.")
+spam2(irshift,__irshift__, "a = irshift(a, b) -- Same as a >>= b.")
+spam2(iand,__iand__, "a = iand(a, b) -- Same as a &= b.")
+spam2(ixor,__ixor__, "a = ixor(a, b) -- Same as a ^= b.")
+spam2(ior,__ior__, "a = ior(a, b) -- Same as a |= b.")
 spam2(concat,__concat__,
  "concat(a, b) -- Same as a + b, for a and b sequences.")
@@ -276 +295 @@
  "repeat(a, b) -- Return a * b, where a is a sequence, and b is an integer.")
 spam2(iconcat,__iconcat__,
- "iconcat(a, b) -- Same as a += b, for a and b sequences.")
+ "a = iconcat(a, b) -- Same as a += b, for a and b sequences.")
 spam2(irepeat,__irepeat__,
- "irepeat(a, b) -- Same as a *= b, where a is a sequence, and b is an integer.")
+ "a = irepeat(a, b) -- Same as a *= b, where a is a sequence, and b is an integer.")
 spam2(getitem,__getitem__,
  "getitem(a, b) -- Same as a[b].")
@@ -286 +305 @@
  "delitem(a, b) -- Same as del a[b].")
 spam2(pow,__pow__, "pow(a, b) -- Same as a ** b.")
-spam2(ipow,__ipow__, "ipow(a, b) -- Same as a **= b.")
+spam2(ipow,__ipow__, "a = ipow(a, b) -- Same as a **= b.")
 spam2(getslice,__getslice__,
  "getslice(a, b, c) -- Same as a[b:c].")
@@ -300 +319 @@
 spam2(ge,__ge__, "ge(a, b) -- Same as a>=b.")
 
-        {NULL,          NULL}           /* sentinel */
+    {NULL,              NULL}           /* sentinel */
 
 };
@@ -307 +326 @@
 
 typedef struct {
-        PyObject_HEAD
-        Py_ssize_t nitems;
-        PyObject *item;
+    PyObject_HEAD
+    Py_ssize_t nitems;
+    PyObject *item;
 } itemgetterobject;
 
@@ -317 +336 @@
 itemgetter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
-        itemgetterobject *ig;
-        PyObject *item;
-        Py_ssize_t nitems;
-
-        if (!_PyArg_NoKeywords("itemgetter()", kwds))
-                return NULL;
-
-        nitems = PyTuple_GET_SIZE(args);
-        if (nitems <= 1) {
-                if (!PyArg_UnpackTuple(args, "itemgetter", 1, 1, &item))
-                        return NULL;
-        } else 
-                item = args;
-
-        /* create itemgetterobject structure */
-        ig = PyObject_GC_New(itemgetterobject, &itemgetter_type);
-        if (ig == NULL) 
-                return NULL;    
-        
-        Py_INCREF(item);
-        ig->item = item;
-        ig->nitems = nitems;
-
-        PyObject_GC_Track(ig);
-        return (PyObject *)ig;
+    itemgetterobject *ig;
+    PyObject *item;
+    Py_ssize_t nitems;
+
+    if (!_PyArg_NoKeywords("itemgetter()", kwds))
+        return NULL;
+
+    nitems = PyTuple_GET_SIZE(args);
+    if (nitems <= 1) {
+        if (!PyArg_UnpackTuple(args, "itemgetter", 1, 1, &item))
+            return NULL;
+    } else
+        item = args;
+
+    /* create itemgetterobject structure */
+    ig = PyObject_GC_New(itemgetterobject, &itemgetter_type);
+    if (ig == NULL)
+        return NULL;
+
+    Py_INCREF(item);
+    ig->item = item;
+    ig->nitems = nitems;
+
+    PyObject_GC_Track(ig);
+    return (PyObject *)ig;
 }
 
@@ -347 +366 @@
 itemgetter_dealloc(itemgetterobject *ig)
 {
-        PyObject_GC_UnTrack(ig);
-        Py_XDECREF(ig->item);
-        PyObject_GC_Del(ig);
+    PyObject_GC_UnTrack(ig);
+    Py_XDECREF(ig->item);
+    PyObject_GC_Del(ig);
 }
 
@@ -355 +374 @@
 itemgetter_traverse(itemgetterobject *ig, visitproc visit, void *arg)
 {
-        Py_VISIT(ig->item);
-        return 0;
+    Py_VISIT(ig->item);
+    return 0;
 }
 
@@ -362 +381 @@
 itemgetter_call(itemgetterobject *ig, PyObject *args, PyObject *kw)
 {
-        PyObject *obj, *result;
-        Py_ssize_t i, nitems=ig->nitems;
-
-        if (!PyArg_UnpackTuple(args, "itemgetter", 1, 1, &obj))
-                return NULL;
-        if (nitems == 1)
-                return PyObject_GetItem(obj, ig->item);
-
-        assert(PyTuple_Check(ig->item));
-        assert(PyTuple_GET_SIZE(ig->item) == nitems);
-
-        result = PyTuple_New(nitems);
-        if (result == NULL)
-                return NULL;
-
-        for (i=0 ; i < nitems ; i++) {
-                PyObject *item, *val;
-                item = PyTuple_GET_ITEM(ig->item, i);
-                val = PyObject_GetItem(obj, item);
-                if (val == NULL) {
-                        Py_DECREF(result);
-                        return NULL;
-                }
-                PyTuple_SET_ITEM(result, i, val);
-        }
-        return result;
+    PyObject *obj, *result;
+    Py_ssize_t i, nitems=ig->nitems;
+
+    if (!PyArg_UnpackTuple(args, "itemgetter", 1, 1, &obj))
+        return NULL;
+    if (nitems == 1)
+        return PyObject_GetItem(obj, ig->item);
+
+    assert(PyTuple_Check(ig->item));
+    assert(PyTuple_GET_SIZE(ig->item) == nitems);
+
+    result = PyTuple_New(nitems);
+    if (result == NULL)
+        return NULL;
+
+    for (i=0 ; i < nitems ; i++) {
+        PyObject *item, *val;
+        item = PyTuple_GET_ITEM(ig->item, i);
+        val = PyObject_GetItem(obj, item);
+        if (val == NULL) {
+            Py_DECREF(result);
+            return NULL;
+        }
+        PyTuple_SET_ITEM(result, i, val);
+    }
+    return result;
 }
 
@@ -394 +413 @@
 \n\
 Return a callable object that fetches the given item(s) from its operand.\n\
-After, f=itemgetter(2), the call f(r) returns r[2].\n\
-After, g=itemgetter(2,5,3), the call g(r) returns (r[2], r[5], r[3])");
+After f = itemgetter(2), the call f(r) returns r[2].\n\
+After g = itemgetter(2, 5, 3), the call g(r) returns (r[2], r[5], r[3])");
 
 static PyTypeObject itemgetter_type = {
-        PyVarObject_HEAD_INIT(NULL, 0)
-        "operator.itemgetter",          /* tp_name */
-        sizeof(itemgetterobject),       /* tp_basicsize */
-        0,                              /* tp_itemsize */
-        /* methods */
-        (destructor)itemgetter_dealloc, /* tp_dealloc */
-        0,                              /* tp_print */
-        0,                              /* tp_getattr */
-        0,                              /* tp_setattr */
-        0,                              /* tp_compare */
-        0,                              /* tp_repr */
-        0,                              /* tp_as_number */
-        0,                              /* tp_as_sequence */
-        0,                              /* tp_as_mapping */
-        0,                              /* tp_hash */
-        (ternaryfunc)itemgetter_call,   /* tp_call */
-        0,                              /* tp_str */
-        PyObject_GenericGetAttr,        /* tp_getattro */
-        0,                              /* tp_setattro */
-        0,                              /* tp_as_buffer */
-        Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,        /* tp_flags */
-        itemgetter_doc,                 /* tp_doc */
-        (traverseproc)itemgetter_traverse,      /* tp_traverse */
-        0,                              /* tp_clear */
-        0,                              /* tp_richcompare */
-        0,                              /* tp_weaklistoffset */
-        0,                              /* tp_iter */
-        0,                              /* tp_iternext */
-        0,                              /* 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 */
-        itemgetter_new,                 /* tp_new */
-        0,                              /* tp_free */
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "operator.itemgetter",              /* tp_name */
+    sizeof(itemgetterobject),           /* tp_basicsize */
+    0,                                  /* tp_itemsize */
+    /* methods */
+    (destructor)itemgetter_dealloc,     /* tp_dealloc */
+    0,                                  /* tp_print */
+    0,                                  /* tp_getattr */
+    0,                                  /* tp_setattr */
+    0,                                  /* tp_compare */
+    0,                                  /* tp_repr */
+    0,                                  /* tp_as_number */
+    0,                                  /* tp_as_sequence */
+    0,                                  /* tp_as_mapping */
+    0,                                  /* tp_hash */
+    (ternaryfunc)itemgetter_call,       /* tp_call */
+    0,                                  /* tp_str */
+    PyObject_GenericGetAttr,            /* tp_getattro */
+    0,                                  /* tp_setattro */
+    0,                                  /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,            /* tp_flags */
+    itemgetter_doc,                     /* tp_doc */
+    (traverseproc)itemgetter_traverse,          /* tp_traverse */
+    0,                                  /* tp_clear */
+    0,                                  /* tp_richcompare */
+    0,                                  /* tp_weaklistoffset */
+    0,                                  /* tp_iter */
+    0,                                  /* tp_iternext */
+    0,                                  /* 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 */
+    itemgetter_new,                     /* tp_new */
+    0,                                  /* tp_free */
 };
 
@@ -444 +463 @@
 
 typedef struct {
-        PyObject_HEAD
-        Py_ssize_t nattrs;
-        PyObject *attr;
+    PyObject_HEAD
+    Py_ssize_t nattrs;
+    PyObject *attr;
 } attrgetterobject;
 
@@ -454 +473 @@
 attrgetter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
-        attrgetterobject *ag;
-        PyObject *attr;
-        Py_ssize_t nattrs;
-
-        if (!_PyArg_NoKeywords("attrgetter()", kwds))
-                return NULL;
-
-        nattrs = PyTuple_GET_SIZE(args);
-        if (nattrs <= 1) {
-                if (!PyArg_UnpackTuple(args, "attrgetter", 1, 1, &attr))
-                        return NULL;
-        } else 
-                attr = args;
-
-        /* create attrgetterobject structure */
-        ag = PyObject_GC_New(attrgetterobject, &attrgetter_type);
-        if (ag == NULL) 
-                return NULL;    
-        
-        Py_INCREF(attr);
-        ag->attr = attr;
-        ag->nattrs = nattrs;
-
-        PyObject_GC_Track(ag);
-        return (PyObject *)ag;
+    attrgetterobject *ag;
+    PyObject *attr;
+    Py_ssize_t nattrs;
+
+    if (!_PyArg_NoKeywords("attrgetter()", kwds))
+        return NULL;
+
+    nattrs = PyTuple_GET_SIZE(args);
+    if (nattrs <= 1) {
+        if (!PyArg_UnpackTuple(args, "attrgetter", 1, 1, &attr))
+            return NULL;
+    } else
+        attr = args;
+
+    /* create attrgetterobject structure */
+    ag = PyObject_GC_New(attrgetterobject, &attrgetter_type);
+    if (ag == NULL)
+        return NULL;
+
+    Py_INCREF(attr);
+    ag->attr = attr;
+    ag->nattrs = nattrs;
+
+    PyObject_GC_Track(ag);
+    return (PyObject *)ag;
 }
 
@@ -484 +503 @@
 attrgetter_dealloc(attrgetterobject *ag)
 {
-        PyObject_GC_UnTrack(ag);
-        Py_XDECREF(ag->attr);
-        PyObject_GC_Del(ag);
+    PyObject_GC_UnTrack(ag);
+    Py_XDECREF(ag->attr);
+    PyObject_GC_Del(ag);
 }
 
@@ -492 +511 @@
 attrgetter_traverse(attrgetterobject *ag, visitproc visit, void *arg)
 {
-        Py_VISIT(ag->attr);
-        return 0;
+    Py_VISIT(ag->attr);
+    return 0;
 }
 
@@ -499 +518 @@
 dotted_getattr(PyObject *obj, PyObject *attr)
 {
-        char *s, *p;
+    char *s, *p;
 
 #ifdef Py_USING_UNICODE
-        if (PyUnicode_Check(attr)) {
-                attr = _PyUnicode_AsDefaultEncodedString(attr, NULL);
-                if (attr == NULL)
-                        return NULL;
-        }
+    if (PyUnicode_Check(attr)) {
+        attr = _PyUnicode_AsDefaultEncodedString(attr, NULL);
+        if (attr == NULL)
+            return NULL;
+    }
 #endif
-        
-        if (!PyString_Check(attr)) {
-                PyErr_SetString(PyExc_TypeError,
-                                "attribute name must be a string");
-                return NULL;
-        }
-
-        s = PyString_AS_STRING(attr);
-        Py_INCREF(obj);
-        for (;;) {
-                PyObject *newobj, *str;
-                p = strchr(s, '.');
-                str = p ? PyString_FromStringAndSize(s, (p-s)) : 
-                          PyString_FromString(s);
-                if (str == NULL) {
-                        Py_DECREF(obj);
-                        return NULL;
-                }
-                newobj = PyObject_GetAttr(obj, str);
-                Py_DECREF(str);
-                Py_DECREF(obj);
-                if (newobj == NULL)
-                        return NULL;
-                obj = newobj;
-                if (p == NULL) break;
-                s = p+1;
-        }
-
-        return obj;
+
+    if (!PyString_Check(attr)) {
+        PyErr_SetString(PyExc_TypeError,
+                        "attribute name must be a string");
+        return NULL;
+    }
+
+    s = PyString_AS_STRING(attr);
+    Py_INCREF(obj);
+    for (;;) {
+        PyObject *newobj, *str;
+        p = strchr(s, '.');
+        str = p ? PyString_FromStringAndSize(s, (p-s)) :
+              PyString_FromString(s);
+        if (str == NULL) {
+            Py_DECREF(obj);
+            return NULL;
+        }
+        newobj = PyObject_GetAttr(obj, str);
+        Py_DECREF(str);
+        Py_DECREF(obj);
+        if (newobj == NULL)
+            return NULL;
+        obj = newobj;
+        if (p == NULL) break;
+        s = p+1;
+    }
+
+    return obj;
 }
 
@@ -542 +561 @@
 attrgetter_call(attrgetterobject *ag, PyObject *args, PyObject *kw)
 {
-        PyObject *obj, *result;
-        Py_ssize_t i, nattrs=ag->nattrs;
-
-        if (!PyArg_UnpackTuple(args, "attrgetter", 1, 1, &obj))
-                return NULL;
-        if (ag->nattrs == 1)
-                return dotted_getattr(obj, ag->attr);
-
-        assert(PyTuple_Check(ag->attr));
-        assert(PyTuple_GET_SIZE(ag->attr) == nattrs);
-
-        result = PyTuple_New(nattrs);
-        if (result == NULL)
-                return NULL;
-
-        for (i=0 ; i < nattrs ; i++) {
-                PyObject *attr, *val;
-                attr = PyTuple_GET_ITEM(ag->attr, i);
-                val = dotted_getattr(obj, attr);
-                if (val == NULL) {
-                        Py_DECREF(result);
-                        return NULL;
-                }
-                PyTuple_SET_ITEM(result, i, val);
-        }
-        return result;
+    PyObject *obj, *result;
+    Py_ssize_t i, nattrs=ag->nattrs;
+
+    if (!PyArg_UnpackTuple(args, "attrgetter", 1, 1, &obj))
+        return NULL;
+    if (ag->nattrs == 1)
+        return dotted_getattr(obj, ag->attr);
+
+    assert(PyTuple_Check(ag->attr));
+    assert(PyTuple_GET_SIZE(ag->attr) == nattrs);
+
+    result = PyTuple_New(nattrs);
+    if (result == NULL)
+        return NULL;
+
+    for (i=0 ; i < nattrs ; i++) {
+        PyObject *attr, *val;
+        attr = PyTuple_GET_ITEM(ag->attr, i);
+        val = dotted_getattr(obj, attr);
+        if (val == NULL) {
+            Py_DECREF(result);
+            return NULL;
+        }
+        PyTuple_SET_ITEM(result, i, val);
+    }
+    return result;
 }
 
@@ -574 +593 @@
 \n\
 Return a callable object that fetches the given attribute(s) from its operand.\n\
-After, f=attrgetter('name'), the call f(r) returns r.name.\n\
-After, g=attrgetter('name', 'date'), the call g(r) returns (r.name, r.date).\n\
-After, h=attrgetter('name.first', 'name.last'), the call h(r) returns\n\
+After f = attrgetter('name'), the call f(r) returns r.name.\n\
+After g = attrgetter('name', 'date'), the call g(r) returns (r.name, r.date).\n\
+After h = attrgetter('name.first', 'name.last'), the call h(r) returns\n\
 (r.name.first, r.name.last).");
 
 static PyTypeObject attrgetter_type = {
-        PyVarObject_HEAD_INIT(NULL, 0)
-        "operator.attrgetter",          /* tp_name */
-        sizeof(attrgetterobject),       /* tp_basicsize */
-        0,                              /* tp_itemsize */
-        /* methods */
-        (destructor)attrgetter_dealloc, /* tp_dealloc */
-        0,                              /* tp_print */
-        0,                              /* tp_getattr */
-        0,                              /* tp_setattr */
-        0,                              /* tp_compare */
-        0,                              /* tp_repr */
-        0,                              /* tp_as_number */
-        0,                              /* tp_as_sequence */
-        0,                              /* tp_as_mapping */
-        0,                              /* tp_hash */
-        (ternaryfunc)attrgetter_call,   /* tp_call */
-        0,                              /* tp_str */
-        PyObject_GenericGetAttr,        /* tp_getattro */
-        0,                              /* tp_setattro */
-        0,                              /* tp_as_buffer */
-        Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,        /* tp_flags */
-        attrgetter_doc,                 /* tp_doc */
-        (traverseproc)attrgetter_traverse,      /* tp_traverse */
-        0,                              /* tp_clear */
-        0,                              /* tp_richcompare */
-        0,                              /* tp_weaklistoffset */
-        0,                              /* tp_iter */
-        0,                              /* tp_iternext */
-        0,                              /* 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 */
-        attrgetter_new,                 /* tp_new */
-        0,                              /* tp_free */
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "operator.attrgetter",              /* tp_name */
+    sizeof(attrgetterobject),           /* tp_basicsize */
+    0,                                  /* tp_itemsize */
+    /* methods */
+    (destructor)attrgetter_dealloc,     /* tp_dealloc */
+    0,                                  /* tp_print */
+    0,                                  /* tp_getattr */
+    0,                                  /* tp_setattr */
+    0,                                  /* tp_compare */
+    0,                                  /* tp_repr */
+    0,                                  /* tp_as_number */
+    0,                                  /* tp_as_sequence */
+    0,                                  /* tp_as_mapping */
+    0,                                  /* tp_hash */
+    (ternaryfunc)attrgetter_call,       /* tp_call */
+    0,                                  /* tp_str */
+    PyObject_GenericGetAttr,            /* tp_getattro */
+    0,                                  /* tp_setattro */
+    0,                                  /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,            /* tp_flags */
+    attrgetter_doc,                     /* tp_doc */
+    (traverseproc)attrgetter_traverse,          /* tp_traverse */
+    0,                                  /* tp_clear */
+    0,                                  /* tp_richcompare */
+    0,                                  /* tp_weaklistoffset */
+    0,                                  /* tp_iter */
+    0,                                  /* tp_iternext */
+    0,                                  /* 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 */
+    attrgetter_new,                     /* tp_new */
+    0,                                  /* tp_free */
 };
 
@@ -626 +645 @@
 
 typedef struct {
-        PyObject_HEAD
-        PyObject *name;
-        PyObject *args;
-        PyObject *kwds;
+    PyObject_HEAD
+    PyObject *name;
+    PyObject *args;
+    PyObject *kwds;
 } methodcallerobject;
 
@@ -637 +656 @@
 methodcaller_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
-        methodcallerobject *mc;
-        PyObject *name, *newargs;
-
-        if (PyTuple_GET_SIZE(args) < 1) {
-                PyErr_SetString(PyExc_TypeError, "methodcaller needs at least "
-                                "one argument, the method name");
-                return NULL;
-        }
-
-        /* create methodcallerobject structure */
-        mc = PyObject_GC_New(methodcallerobject, &methodcaller_type);
-        if (mc == NULL) 
-                return NULL;    
-
-        newargs = PyTuple_GetSlice(args, 1, PyTuple_GET_SIZE(args));
-        if (newargs == NULL) {
-                Py_DECREF(mc);
-                return NULL;
-        }
-        mc->args = newargs;
-
-        name = PyTuple_GET_ITEM(args, 0);
-        Py_INCREF(name);
-        mc->name = name;
-
-        Py_XINCREF(kwds);
-        mc->kwds = kwds;
-
-        PyObject_GC_Track(mc);
-        return (PyObject *)mc;
+    methodcallerobject *mc;
+    PyObject *name, *newargs;
+
+    if (PyTuple_GET_SIZE(args) < 1) {
+        PyErr_SetString(PyExc_TypeError, "methodcaller needs at least "
+                        "one argument, the method name");
+        return NULL;
+    }
+
+    /* create methodcallerobject structure */
+    mc = PyObject_GC_New(methodcallerobject, &methodcaller_type);
+    if (mc == NULL)
+        return NULL;
+
+    newargs = PyTuple_GetSlice(args, 1, PyTuple_GET_SIZE(args));
+    if (newargs == NULL) {
+        Py_DECREF(mc);
+        return NULL;
+    }
+    mc->args = newargs;
+
+    name = PyTuple_GET_ITEM(args, 0);
+    Py_INCREF(name);
+    mc->name = name;
+
+    Py_XINCREF(kwds);
+    mc->kwds = kwds;
+
+    PyObject_GC_Track(mc);
+    return (PyObject *)mc;
 }
 
@@ -672 +691 @@
 methodcaller_dealloc(methodcallerobject *mc)
 {
-        PyObject_GC_UnTrack(mc);
-        Py_XDECREF(mc->name);
-        Py_XDECREF(mc->args);
-        Py_XDECREF(mc->kwds);
-        PyObject_GC_Del(mc);
+    PyObject_GC_UnTrack(mc);
+    Py_XDECREF(mc->name);
+    Py_XDECREF(mc->args);
+    Py_XDECREF(mc->kwds);
+    PyObject_GC_Del(mc);
 }
 
@@ -682 +701 @@
 methodcaller_traverse(methodcallerobject *mc, visitproc visit, void *arg)
 {
-        Py_VISIT(mc->args);
-        Py_VISIT(mc->kwds);
-        return 0;
+    Py_VISIT(mc->args);
+    Py_VISIT(mc->kwds);
+    return 0;
 }
 
@@ -690 +709 @@
 methodcaller_call(methodcallerobject *mc, PyObject *args, PyObject *kw)
 {
-        PyObject *method, *obj, *result;
-
-        if (!PyArg_UnpackTuple(args, "methodcaller", 1, 1, &obj))
-                return NULL;
-        method = PyObject_GetAttr(obj, mc->name);
-        if (method == NULL)
-                return NULL;
-        result = PyObject_Call(method, mc->args, mc->kwds);
-        Py_DECREF(method);
-        return result;
+    PyObject *method, *obj, *result;
+
+    if (!PyArg_UnpackTuple(args, "methodcaller", 1, 1, &obj))
+        return NULL;
+    method = PyObject_GetAttr(obj, mc->name);
+    if (method == NULL)
+        return NULL;
+    result = PyObject_Call(method, mc->args, mc->kwds);
+    Py_DECREF(method);
+    return result;
 }
 
@@ -706 +725 @@
 \n\
 Return a callable object that calls the given method on its operand.\n\
-After, f = methodcaller('name'), the call f(r) returns r.name().\n\
-After, g = methodcaller('name', 'date', foo=1), the call g(r) returns\n\
+After f = methodcaller('name'), the call f(r) returns r.name().\n\
+After g = methodcaller('name', 'date', foo=1), the call g(r) returns\n\
 r.name('date', foo=1).");
 
 static PyTypeObject methodcaller_type = {
-        PyVarObject_HEAD_INIT(NULL, 0)
-        "operator.methodcaller",        /* tp_name */
-        sizeof(methodcallerobject),     /* tp_basicsize */
-        0,                              /* tp_itemsize */
-        /* methods */
-        (destructor)methodcaller_dealloc, /* tp_dealloc */
-        0,                              /* tp_print */
-        0,                              /* tp_getattr */
-        0,                              /* tp_setattr */
-        0,                              /* tp_compare */
-        0,                              /* tp_repr */
-        0,                              /* tp_as_number */
-        0,                              /* tp_as_sequence */
-        0,                              /* tp_as_mapping */
-        0,                              /* tp_hash */
-        (ternaryfunc)methodcaller_call, /* tp_call */
-        0,                              /* tp_str */
-        PyObject_GenericGetAttr,        /* tp_getattro */
-        0,                              /* tp_setattro */
-        0,                              /* tp_as_buffer */
-        Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
-        methodcaller_doc,                       /* tp_doc */
-        (traverseproc)methodcaller_traverse,    /* tp_traverse */
-        0,                              /* tp_clear */
-        0,                              /* tp_richcompare */
-        0,                              /* tp_weaklistoffset */
-        0,                              /* tp_iter */
-        0,                              /* tp_iternext */
-        0,                              /* 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 */
-        methodcaller_new,               /* tp_new */
-        0,                              /* tp_free */
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "operator.methodcaller",            /* tp_name */
+    sizeof(methodcallerobject),         /* tp_basicsize */
+    0,                                  /* tp_itemsize */
+    /* methods */
+    (destructor)methodcaller_dealloc, /* tp_dealloc */
+    0,                                  /* tp_print */
+    0,                                  /* tp_getattr */
+    0,                                  /* tp_setattr */
+    0,                                  /* tp_compare */
+    0,                                  /* tp_repr */
+    0,                                  /* tp_as_number */
+    0,                                  /* tp_as_sequence */
+    0,                                  /* tp_as_mapping */
+    0,                                  /* tp_hash */
+    (ternaryfunc)methodcaller_call,     /* tp_call */
+    0,                                  /* tp_str */
+    PyObject_GenericGetAttr,            /* tp_getattro */
+    0,                                  /* tp_setattro */
+    0,                                  /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
+    methodcaller_doc,                           /* tp_doc */
+    (traverseproc)methodcaller_traverse,        /* tp_traverse */
+    0,                                  /* tp_clear */
+    0,                                  /* tp_richcompare */
+    0,                                  /* tp_weaklistoffset */
+    0,                                  /* tp_iter */
+    0,                                  /* tp_iternext */
+    0,                                  /* 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 */
+    methodcaller_new,                   /* tp_new */
+    0,                                  /* tp_free */
 };
 
@@ -759 +778 @@
 initoperator(void)
 {
-        PyObject *m;
-        
-        /* Create the module and add the functions */
-        m = Py_InitModule4("operator", operator_methods, operator_doc,
-                       (PyObject*)NULL, PYTHON_API_VERSION);
-        if (m == NULL)
-                return;
-
-        if (PyType_Ready(&itemgetter_type) < 0)
-                return;
-        Py_INCREF(&itemgetter_type);
-        PyModule_AddObject(m, "itemgetter", (PyObject *)&itemgetter_type);
-
-        if (PyType_Ready(&attrgetter_type) < 0)
-                return;
-        Py_INCREF(&attrgetter_type);
-        PyModule_AddObject(m, "attrgetter", (PyObject *)&attrgetter_type);
-
-        if (PyType_Ready(&methodcaller_type) < 0)
-                return;
-        Py_INCREF(&methodcaller_type);
-        PyModule_AddObject(m, "methodcaller", (PyObject *)&methodcaller_type);
-}
+    PyObject *m;
+
+    /* Create the module and add the functions */
+    m = Py_InitModule4("operator", operator_methods, operator_doc,
+                   (PyObject*)NULL, PYTHON_API_VERSION);
+    if (m == NULL)
+        return;
+
+    if (PyType_Ready(&itemgetter_type) < 0)
+        return;
+    Py_INCREF(&itemgetter_type);
+    PyModule_AddObject(m, "itemgetter", (PyObject *)&itemgetter_type);
+
+    if (PyType_Ready(&attrgetter_type) < 0)
+        return;
+    Py_INCREF(&attrgetter_type);
+    PyModule_AddObject(m, "attrgetter", (PyObject *)&attrgetter_type);
+
+    if (PyType_Ready(&methodcaller_type) < 0)
+        return;
+    Py_INCREF(&methodcaller_type);
+    PyModule_AddObject(m, "methodcaller", (PyObject *)&methodcaller_type);
+}