From: Stefan Behnel <scoder@users.berlios.de>
Date: Fri, 27 Feb 2009 07:35:02 +0000 (+0100)
Subject: merge
X-Git-Tag: 0.11.rc~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ad3fc7330711476e79cd1059e1aad4f0e715e953;p=cython.git

merge
---

ad3fc7330711476e79cd1059e1aad4f0e715e953
diff --cc Cython/Compiler/ExprNodes.py
index 0ad0b60d,ec3e7b97..6d313c68
--- a/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
@@@ -5409,11 -5409,10 +5409,11 @@@ static INLINE PyObject *__Pyx_GetItemIn
      Py_DECREF(j);
      return r;
  }
 -
 -static INLINE PyObject *__Pyx_GetItemInt_List(PyObject *o, Py_ssize_t i, int is_unsigned) {
 -    if (likely(o != Py_None) && likely((0 <= i) & (i < PyList_GET_SIZE(o)))) {
 -        PyObject *r = PyList_GET_ITEM(o, i);
 +""" + ''.join([
 +"""
 +static INLINE PyObject *__Pyx_GetItemInt_%(type)s(PyObject *o, Py_ssize_t i, int is_unsigned) {
-     if (likely(o != Py_None && ((0 <= i) & (i < Py%(type)s_GET_SIZE(o))))) {
++    if (likely(o != Py_None && likely((0 <= i) & (i < Py%(type)s_GET_SIZE(o))))) {
 +        PyObject *r = Py%(type)s_GET_ITEM(o, i);
          Py_INCREF(r);
          return r;
      }