Skip to content

Commit e29c15d

Browse files
gh-144128: Address review feedback
1 parent 4b06317 commit e29c15d

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

Lib/test/test_array.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,14 @@ def __index__(self):
7777
return "not an int"
7878

7979
for typecode in ('I', 'L', 'Q'):
80-
lst = []
81-
e = Evil(lst)
82-
lst.append(e)
83-
del e
84-
a = array.array(typecode)
85-
with self.assertRaises(TypeError):
86-
a.fromlist(lst)
80+
with self.subTest(typecode=typecode):
81+
lst = []
82+
e = Evil(lst)
83+
lst.append(e)
84+
del e
85+
a = array.array(typecode)
86+
with self.assertRaises(TypeError):
87+
a.fromlist(lst)
8788

8889

8990

Modules/arraymodule.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ II_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
410410
if (!PyLong_Check(v)) {
411411
PyObject *orig_v = v;
412412
Py_INCREF(orig_v);
413-
v = _PyNumber_Index(v);
413+
v = _PyNumber_Index(orig_v);
414414
Py_DECREF(orig_v);
415415
if (NULL == v) {
416416
return -1;
@@ -473,7 +473,7 @@ LL_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
473473
if (!PyLong_Check(v)) {
474474
PyObject *orig_v = v;
475475
Py_INCREF(orig_v);
476-
v = _PyNumber_Index(v);
476+
v = _PyNumber_Index(orig_v);
477477
Py_DECREF(orig_v);
478478
if (NULL == v) {
479479
return -1;
@@ -529,7 +529,7 @@ QQ_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
529529
if (!PyLong_Check(v)) {
530530
PyObject *orig_v = v;
531531
Py_INCREF(orig_v);
532-
v = _PyNumber_Index(v);
532+
v = _PyNumber_Index(orig_v);
533533
Py_DECREF(orig_v);
534534
if (NULL == v) {
535535
return -1;

0 commit comments

Comments
 (0)