/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-17 00:34:28 UTC
  • mfrom: (4754 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4755.
  • Revision ID: john@arbash-meinel.com-20091017003428-opg71qwkbzr3clko
Merge bzr.dev resolve test conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_static_tuple_c.c
464
464
            return NULL; /* There seems to be an error */
465
465
        }
466
466
        if (result == Py_NotImplemented) {
467
 
            PyErr_BadInternalCall();
468
467
            Py_DECREF(result);
469
 
            return NULL;
 
468
            /* One side must have had a string and the other a StaticTuple.
 
469
             * This clearly means that they are not equal.
 
470
             */
 
471
            if (op == Py_EQ) {
 
472
                Py_INCREF(Py_False);
 
473
                return Py_False;
 
474
            }
 
475
            result = PyObject_RichCompare(v_obj, w_obj, Py_EQ);
470
476
        }
471
477
        if (result == Py_False) {
472
478
            /* This entry is not identical
654
660
    (hashfunc)StaticTuple_hash,                  /* tp_hash */
655
661
    0,                                           /* tp_call */
656
662
    0,                                           /* tp_str */
657
 
    PyObject_GenericGetAttr,                     /* tp_getattro */
 
663
    0,                                           /* tp_getattro */
658
664
    0,                                           /* tp_setattro */
659
665
    0,                                           /* tp_as_buffer */
660
666
    Py_TPFLAGS_DEFAULT,                          /* tp_flags*/
791
797
{
792
798
    PyObject* m;
793
799
 
 
800
    StaticTuple_Type.tp_getattro = PyObject_GenericGetAttr;
794
801
    if (PyType_Ready(&StaticTuple_Type) < 0)
795
802
        return;
796
803