Skip to content

Commit 815d4fb

Browse files
committed
[GR-9749] List.index ends with IndexError instead ValueError.
1 parent 5d78ba5 commit 815d4fb

File tree

2 files changed

+4
-5
lines changed
  • graalpython

2 files changed

+4
-5
lines changed

graalpython/com.oracle.graal.python.test/src/tests/list_tests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ def __eq__(self, other):
361361
for x, y in zip(d, e):
362362
# verify that original order and values are retained.
363363
self.assertIs(x, y)
364-
'''
364+
365365
def test_count(self):
366366
a = self.type2test([0, 1, 2])*3
367367
self.assertEqual(a.count(0), 3)
@@ -380,7 +380,7 @@ def __eq__(self, other):
380380
return False
381381

382382
self.assertRaises(BadExc, a.count, BadCmp())
383-
383+
384384
def test_index(self):
385385
u = self.type2test([0, 1])
386386
self.assertEqual(u.index(0), 0)
@@ -437,7 +437,7 @@ def __eq__(self, other):
437437
a[:] = [EvilCmp(a) for _ in range(100)]
438438
# This used to seg fault before patch #1005778
439439
self.assertRaises(ValueError, a.index, None)
440-
440+
441441
def test_reverse(self):
442442
u = self.type2test([-2, -1, 0, 1, 2])
443443
u2 = u[:]

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/ListBuiltins.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -808,8 +808,7 @@ private static int correctIndex(PList list, PInt index) {
808808
}
809809

810810
private int findIndex(PList list, Object value, int start, int end, BinaryComparisonNode eqNode) {
811-
int len = list.len();
812-
for (int i = start; i < end && i < len; i++) {
811+
for (int i = start; i < end && i < list.len(); i++) {
813812
Object object = list.getItem(i);
814813
if (eqNode.executeBool(object, value)) {
815814
return i;

0 commit comments

Comments
 (0)