From: Stefan Behnel <stefan_ml@behnel.de>
Date: Sat, 16 Mar 2013 20:13:25 +0000 (+0100)
Subject: fix slicing in PyPy
X-Git-Tag: 0.19b1~37
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f808128550a10d93a5002d8fd8e86a326a6dfd72;p=platform%2Fupstream%2Fpython-cython.git

fix slicing in PyPy
---

diff --git a/Cython/Utility/ObjectHandling.c b/Cython/Utility/ObjectHandling.c
index 92e0378..0c3524b 100644
--- a/Cython/Utility/ObjectHandling.c
+++ b/Cython/Utility/ObjectHandling.c
@@ -474,6 +474,7 @@ static CYTHON_INLINE int __Pyx_PyObject_SetSlice(
 {{endif}}
         PyObject** _py_start, PyObject** _py_stop, PyObject** _py_slice,
         int has_cstart, int has_cstop, CYTHON_UNUSED int wraparound) {
+#if CYTHON_COMPILING_IN_CPYTHON
     PyMappingMethods* mp;
 #if PY_MAJOR_VERSION < 3
     PySequenceMethods* ms = Py_TYPE(obj)->tp_as_sequence;
@@ -521,12 +522,13 @@ static CYTHON_INLINE int __Pyx_PyObject_SetSlice(
 
     mp = Py_TYPE(obj)->tp_as_mapping;
 {{if access == 'Get'}}
-    if (likely(mp && mp->mp_subscript)) {
-        PyObject *result;
+    if (likely(mp && mp->mp_subscript))
 {{else}}
-    if (likely(mp && mp->mp_ass_subscript)) {
-        int result;
+    if (likely(mp && mp->mp_ass_subscript))
 {{endif}}
+#endif
+    {
+        {{if access == 'Get'}}PyObject*{{else}}int{{endif}} result;
         PyObject *py_slice, *py_start, *py_stop;
         if (_py_slice) {
             py_slice = *_py_slice;
@@ -559,11 +561,17 @@ static CYTHON_INLINE int __Pyx_PyObject_SetSlice(
             Py_XDECREF(owned_stop);
             if (unlikely(!py_slice)) goto bad;
         }
+#if CYTHON_COMPILING_IN_CPYTHON
 {{if access == 'Get'}}
         result = mp->mp_subscript(obj, py_slice);
+#else
+        result = PyObject_GetItem(obj, py_slice);
 {{else}}
         result = mp->mp_ass_subscript(obj, py_slice, value);
+#else
+        result = value ? PyObject_SetItem(obj, py_slice, value) : PyObject_DelItem(obj, py_slice);
 {{endif}}
+#endif
         if (!_py_slice) {
             Py_DECREF(py_slice);
         }