Commit 7991529d authored by Tres Seaver's avatar Tres Seaver

Better argument name.

parent fce28b5b
...@@ -409,21 +409,20 @@ BTreeItems_slice(BTreeItems *self, Py_ssize_t ilow, Py_ssize_t ihigh) ...@@ -409,21 +409,20 @@ BTreeItems_slice(BTreeItems *self, Py_ssize_t ilow, Py_ssize_t ihigh)
} }
static PyObject * static PyObject *
BTreeItems_subscript(BTreeItems *self, PyObject* key) BTreeItems_subscript(BTreeItems *self, PyObject* subscript)
{ {
Py_ssize_t len = BTreeItems_length_or_nonzero(self, 0); Py_ssize_t len = BTreeItems_length_or_nonzero(self, 0);
if (PyIndex_Check(key)) if (PyIndex_Check(subscript))
{ {
Py_ssize_t i = INT_AS_LONG(key); Py_ssize_t i = PyNumber_AsSsize_t(subscript, PyExc_IndexError);
i = PyNumber_AsSsize_t(key, PyExc_IndexError);
if (i == -1 && PyErr_Occurred()) if (i == -1 && PyErr_Occurred())
return NULL; return NULL;
if (i < 0) if (i < 0)
i += len; i += len;
return BTreeItems_item(self, i); return BTreeItems_item(self, i);
} }
if (PySlice_Check(key)) if (PySlice_Check(subscript))
{ {
Py_ssize_t start, stop, step, slicelength; Py_ssize_t start, stop, step, slicelength;
...@@ -433,7 +432,7 @@ BTreeItems_subscript(BTreeItems *self, PyObject* key) ...@@ -433,7 +432,7 @@ BTreeItems_subscript(BTreeItems *self, PyObject* key)
#define SLICEOBJ(x) (PySliceObject*)(x) #define SLICEOBJ(x) (PySliceObject*)(x)
#endif #endif
if (PySlice_GetIndicesEx(SLICEOBJ(key), len, if (PySlice_GetIndicesEx(SLICEOBJ(subscript), len,
&start, &stop, &step, &slicelength) < 0) &start, &stop, &step, &slicelength) < 0)
{ {
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment