Index: Objects/classobject.c =================================================================== --- Objects/classobject.c (revision 76869) +++ Objects/classobject.c (working copy) @@ -1173,6 +1173,13 @@ func = instance_getattr(inst, getitemstr); if (func == NULL) return NULL; + + /* Solve bug 7532 */ + if (i < 0) + i = 0; + if (j < i) + j = i; + arg = Py_BuildValue("(N)", _PySlice_FromIndices(i, j)); } else { @@ -1262,6 +1269,12 @@ if (func == NULL) return -1; + /* Solve bug 7532 */ + if (i < 0) + i = 0; + if (j < i) + j = i; + arg = Py_BuildValue("(N)", _PySlice_FromIndices(i, j)); } @@ -1296,6 +1309,12 @@ if (func == NULL) return -1; + /* Solve bug 7532 */ + if (i < 0) + i = 0; + if (j < i) + j = i; + arg = Py_BuildValue("(NO)", _PySlice_FromIndices(i, j), value); } Index: Lib/test/test_index.py =================================================================== --- Lib/test/test_index.py (revision 76869) +++ Lib/test/test_index.py (working copy) @@ -89,6 +89,21 @@ self.assertEqual(self.seq[self.o:self.o2], self.seq[1:3]) self.assertEqual(self.seq[self.n:self.n2], self.seq[2:4]) + def test_slice_bug7532(self, deprecated=False): + seqlen = len(self.seq) + self.o.ind = int(seqlen * 1.5) + self.o2.ind = -seqlen - 2 + self.n.ind = seqlen + 2 + self.n2.ind = -int(seqlen * 1.5) + self.assertEqual(self.seq[self.o:], self.seq[0:0]) + self.assertEqual(self.seq[self.o2:], self.seq) + self.assertEqual(self.seq[:self.o], self.seq) + self.assertEqual(self.seq[:self.o2], self.seq[0:0]) + self.assertEqual(self.seq[self.n:], self.seq[0:0]) + self.assertEqual(self.seq[self.n2:], self.seq) + self.assertEqual(self.seq[:self.n], self.seq) + self.assertEqual(self.seq[:self.n2], self.seq[0:0]) + def test_repeat(self): self.o.ind = 3 self.n.ind = 2 @@ -156,6 +171,40 @@ self.assertEqual(lst, [5, 6, 7, 8, 9, 11] * 3) +class _BaseSeq: + + def __init__(self, iterable): + self._list = list(iterable) + + def __repr__(self): + return repr(self._list) + + def __eq__(self, other): + return self._list == other + + def __len__(self): + return len(self._list) + + def __mul__(self, n): + return self.__class__(self._list*n) + __rmul__ = __mul__ + + def __getitem__(self, index): + return self._list[index] + + +class _GetSliceMixin: + + def __getslice__(self, i, j): + return self._list.__getslice__(i, j) + + +class ClassicSeq(_BaseSeq): pass +class NewSeq(_BaseSeq, object): pass +class ClassicSeqDeprecated(_GetSliceMixin, ClassicSeq): pass +class NewSeqDeprecated(_GetSliceMixin, NewSeq): pass + + class TupleTestCase(SeqTestCase): seq = (0,10,20,30,40,50) @@ -165,6 +214,18 @@ class UnicodeTestCase(SeqTestCase): seq = u"this is a test" +class ClassicSeqTestCase(SeqTestCase): + seq = ClassicSeq((0,10,20,30,40,50)) + +class NewSeqTestCase(SeqTestCase): + seq = NewSeq((0,10,20,30,40,50)) + +class ClassicSeqDeprecatedTestCase(SeqTestCase): + seq = ClassicSeqDeprecated((0,10,20,30,40,50)) + +class NewSeqDeprecatedTestCase(SeqTestCase): + seq = NewSeqDeprecated((0,10,20,30,40,50)) + class XRangeTestCase(unittest.TestCase): @@ -174,6 +235,7 @@ self.assertEqual(xrange(1, 20)[n], 6) self.assertEqual(xrange(1, 20).__getitem__(n), 6) + class OverflowTestCase(unittest.TestCase): def setUp(self): @@ -187,6 +249,18 @@ def _getitem_helper(self, base): class GetItem(base): def __len__(self): + return maxint # cannot return long here + def __getitem__(self, key): + return key + x = GetItem() + self.assertEqual(x[self.pos], self.pos) + self.assertEqual(x[self.neg], self.neg) + self.assertEqual(x[self.neg:self.pos].indices(maxsize), (0, maxsize, 1)) + self.assertEqual(x[self.neg:self.pos:1].indices(maxsize), (0, maxsize, 1)) + + def _getslice_helper_deprecated(self, base): + class GetItem(base): + def __len__(self): return maxint #cannot return long here def __getitem__(self, key): return key @@ -200,10 +274,16 @@ def test_getitem(self): self._getitem_helper(object) + # Silence Py3k warning + with test_support.check_warnings(): + self._getslice_helper_deprecated(object) def test_getitem_classic(self): class Empty: pass self._getitem_helper(Empty) + # Silence Py3k warning + with test_support.check_warnings(): + self._getslice_helper_deprecated(Empty) def test_sequence_repeat(self): self.assertRaises(OverflowError, lambda: "a" * self.pos) @@ -217,9 +297,18 @@ TupleTestCase, StringTestCase, UnicodeTestCase, + ClassicSeqTestCase, + NewSeqTestCase, XRangeTestCase, OverflowTestCase, ) + # Silence Py3k warning + with test_support.check_warnings(): + test_support.run_unittest( + ClassicSeqDeprecatedTestCase, + NewSeqDeprecatedTestCase, + ) + if __name__ == "__main__": test_main()