/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/_static_tuple_c.c

  • Committer: John Arbash Meinel
  • Date: 2009-10-15 20:44:21 UTC
  • mfrom: (4749 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4758.
  • Revision ID: john@arbash-meinel.com-20091015204421-mstpm5cfeldojxoq
Bring in the latest bzr.dev code, which includes the btree StaticTuple updates.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_static_tuple_c.c
418
418
            return NULL; /* There seems to be an error */
419
419
        }
420
420
        if (result == Py_NotImplemented) {
421
 
            PyErr_BadInternalCall();
422
421
            Py_DECREF(result);
423
 
            return NULL;
 
422
            /* One side must have had a string and the other a StaticTuple.
 
423
             * This clearly means that they are not equal.
 
424
             */
 
425
            if (op == Py_EQ) {
 
426
                Py_INCREF(Py_False);
 
427
                return Py_False;
 
428
            }
 
429
            result = PyObject_RichCompare(v_obj, w_obj, Py_EQ);
424
430
        }
425
431
        if (result == Py_False) {
426
432
            /* This entry is not identical
604
610
    (hashfunc)StaticTuple_hash,                  /* tp_hash */
605
611
    0,                                           /* tp_call */
606
612
    0,                                           /* tp_str */
607
 
    PyObject_GenericGetAttr,                     /* tp_getattro */
 
613
    0,                                           /* tp_getattro */
608
614
    0,                                           /* tp_setattro */
609
615
    0,                                           /* tp_as_buffer */
610
616
    Py_TPFLAGS_DEFAULT,                          /* tp_flags*/
739
745
{
740
746
    PyObject* m;
741
747
 
 
748
    StaticTuple_Type.tp_getattro = PyObject_GenericGetAttr;
742
749
    if (PyType_Ready(&StaticTuple_Type) < 0)
743
750
        return;
744
751