Skip to content

Commit 9071dd4

Browse files
committed
Update
1 parent eda29bc commit 9071dd4

File tree

1 file changed

+31
-30
lines changed

1 file changed

+31
-30
lines changed

Objects/listobject.c

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -233,36 +233,6 @@ valid_index(Py_ssize_t i, Py_ssize_t limit)
233233
return (size_t) i < (size_t) limit;
234234
}
235235

236-
PyObject *
237-
PyList_GetItem(PyObject *op, Py_ssize_t i)
238-
{
239-
if (!PyList_Check(op)) {
240-
PyErr_BadInternalCall();
241-
return NULL;
242-
}
243-
if (!valid_index(i, Py_SIZE(op))) {
244-
_Py_DECLARE_STR(list_err, "list index out of range");
245-
PyErr_SetObject(PyExc_IndexError, &_Py_STR(list_err));
246-
return NULL;
247-
}
248-
return ((PyListObject *)op) -> ob_item[i];
249-
}
250-
251-
PyObject *
252-
PyList_GetItemRef(PyObject *op, Py_ssize_t i)
253-
{
254-
if (!PyList_Check(op)) {
255-
PyErr_SetString(PyExc_TypeError, "expected a list");
256-
return NULL;
257-
}
258-
if (!valid_index(i, Py_SIZE(op))) {
259-
_Py_DECLARE_STR(list_err, "list index out of range");
260-
PyErr_SetObject(PyExc_IndexError, &_Py_STR(list_err));
261-
return NULL;
262-
}
263-
return Py_NewRef(PyList_GET_ITEM(op, i));
264-
}
265-
266236
#ifdef Py_GIL_DISABLED
267237

268238
static PyObject *
@@ -332,6 +302,37 @@ list_get_item_ref(PyListObject *op, Py_ssize_t i)
332302
}
333303
#endif
334304

305+
PyObject *
306+
PyList_GetItem(PyObject *op, Py_ssize_t i)
307+
{
308+
if (!PyList_Check(op)) {
309+
PyErr_BadInternalCall();
310+
return NULL;
311+
}
312+
if (!valid_index(i, Py_SIZE(op))) {
313+
_Py_DECLARE_STR(list_err, "list index out of range");
314+
PyErr_SetObject(PyExc_IndexError, &_Py_STR(list_err));
315+
return NULL;
316+
}
317+
return ((PyListObject *)op) -> ob_item[i];
318+
}
319+
320+
PyObject *
321+
PyList_GetItemRef(PyObject *op, Py_ssize_t i)
322+
{
323+
if (!PyList_Check(op)) {
324+
PyErr_SetString(PyExc_TypeError, "expected a list");
325+
return NULL;
326+
}
327+
PyObject *item = list_get_item_ref((PyListObject *)op, i);
328+
if (item == NULL) {
329+
_Py_DECLARE_STR(list_err, "list index out of range");
330+
PyErr_SetObject(PyExc_IndexError, &_Py_STR(list_err));
331+
return NULL;
332+
}
333+
return item;
334+
}
335+
335336
int
336337
PyList_SetItem(PyObject *op, Py_ssize_t i,
337338
PyObject *newitem)

0 commit comments

Comments
 (0)