Skip to content

Fix FRect slice subscripting #2313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oddbookworm merged 2 commits into from
Jul 16, 2023
Merged

Fix FRect slice subscripting #2313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f02a77b
Fix FRect slice subscripting
ankith26 Jul 14, 2023
6439bae
Update test helper to be more generic
ankith26 Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src_c/rect_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1977,7 +1977,7 @@ RectExport_subscript(RectObject *self, PyObject *op)
return NULL;
}
for (i = 0; i < slicelen; ++i) {
n = PyLong_FromSsize_t((Py_ssize_t)data[start + (step * i)]);
n = PythonNumberFromPrimitiveType(data[start + (step * i)]);
if (n == NULL) {
Py_DECREF(slice);
return NULL;
Expand Down
53 changes: 39 additions & 14 deletions test/rect_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2972,20 +2972,20 @@ def assertAlmostEqual5(self, first, second):
"""
self.assertAlmostEqual(first, second, places=5)

def assertAlmostEqual5C(self, first, second):
def assertSeqAlmostEqual5(self, first, second):
"""
This shouldn't be necessary but manylinux i686 python37
won't work with just assertAlmostEqual5-ing it.
Same as above but for sequences
"""
self.assertAlmostEqual(first[0], second[0], places=5)
self.assertAlmostEqual(first[1], second[1], places=5)
self.assertEqual(len(first), len(second))
for i, j in zip(first, second):
self.assertAlmostEqual5(i, j)

def test_scale_by__larger_single_argument(self):
"""The scale method scales around the center of the rectangle"""
r = FRect(2.1, 4, 6, 8.9)
r2 = r.scale_by(2.3)

self.assertAlmostEqual5C(r.center, r2.center)
self.assertSeqAlmostEqual5(r.center, r2.center)
# ((w * scaling) - w) / 2 -> 3.9
self.assertAlmostEqual5(r.left - 3.9, r2.left)
self.assertAlmostEqual5(r.top - 5.785, r2.top)
Expand All @@ -3000,7 +3000,7 @@ def test_scale_by__larger_single_argument_kwarg(self):
r = FRect(2.1, 4, 6, 8.9)
r2 = r.scale_by(x=2.3)

self.assertAlmostEqual5C(r.center, r2.center)
self.assertSeqAlmostEqual5(r.center, r2.center)
# ((w * scaling) - w) / 2 -> 3.9
self.assertAlmostEqual5(r.left - 3.9, r2.left)
self.assertAlmostEqual5(r.top - 5.785, r2.top)
Expand All @@ -3014,7 +3014,7 @@ def test_scale_by__smaller_single_argument(self):
r = FRect(2.1, 4, 6, 8.9)
r2 = r.scale_by(0.5)

self.assertAlmostEqual5C(r.center, r2.center)
self.assertSeqAlmostEqual5(r.center, r2.center)
self.assertAlmostEqual5(r.left + 1.5, r2.left)
self.assertAlmostEqual5(r.top + 2.225, r2.top)
self.assertAlmostEqual5(r.right - 1.5, r2.right)
Expand All @@ -3029,7 +3029,7 @@ def test_scale_by__larger(self):
# act
r2 = r.scale_by(2, 4)
# assert
self.assertAlmostEqual5C(r.center, r2.center)
self.assertSeqAlmostEqual5(r.center, r2.center)
self.assertAlmostEqual5(r.left - 3, r2.left)
self.assertAlmostEqual5(r.centery - r.h * 4 / 2, r2.top)
self.assertAlmostEqual5(r.right + 3, r2.right)
Expand All @@ -3047,7 +3047,7 @@ def test_scale_by__larger_kwargs_scale_by(self):
# act
r2 = r.scale_by(scale_by=(2, 4))
# assert
self.assertAlmostEqual5C(r.center, r2.center)
self.assertSeqAlmostEqual5(r.center, r2.center)
self.assertAlmostEqual5(r.left - 3, r2.left)
self.assertAlmostEqual5(r.centery - r.h * 4 / 2, r2.top)
self.assertAlmostEqual5(r.right + 3, r2.right)
Expand All @@ -3065,7 +3065,7 @@ def test_scale_by__larger_kwargs(self):
# act
r2 = r.scale_by(x=2, y=4)
# assert
self.assertAlmostEqual5C(r.center, r2.center)
self.assertSeqAlmostEqual5(r.center, r2.center)
self.assertAlmostEqual5(r.left - 3, r2.left)
self.assertAlmostEqual5(r.centery - r.h * 4 / 2, r2.top)
self.assertAlmostEqual5(r.right + 3, r2.right)
Expand All @@ -3080,7 +3080,7 @@ def test_scale_by__smaller(self):
# act
r2 = r.scale_by(0.5, 0.25)
# assert
self.assertAlmostEqual5C(r.center, r2.center)
self.assertSeqAlmostEqual5(r.center, r2.center)
self.assertAlmostEqual5(r.left + 1.5, r2.left)
self.assertAlmostEqual5(r.centery - r.h / 4 / 2, r2.top)
self.assertAlmostEqual5(r.right - 1.5, r2.right)
Expand Down Expand Up @@ -3178,7 +3178,7 @@ def test_scale_by_ip__larger(self):
r2 = FRect(r)
r2.scale_by_ip(2.3)

self.assertAlmostEqual5C(r.center, r2.center)
self.assertSeqAlmostEqual5(r.center, r2.center)
# ((w * scaling) - w) / 2 -> 3.9
self.assertAlmostEqual5(r.left - 3.9, r2.left)
self.assertAlmostEqual5(r.top - 5.785, r2.top)
Expand All @@ -3193,7 +3193,7 @@ def test_scale_by_ip__smaller(self):
r2 = FRect(r)
r2.scale_by_ip(0.5)

self.assertAlmostEqual5C(r.center, r2.center)
self.assertSeqAlmostEqual5(r.center, r2.center)
self.assertAlmostEqual5(r.left + 1.5, r2.left)
self.assertAlmostEqual5(r.top + 2.225, r2.top)
self.assertAlmostEqual5(r.right - 1.5, r2.right)
Expand Down Expand Up @@ -3235,6 +3235,31 @@ def test_scale_by_ip__kwarg_exceptions(self):
with self.assertRaises(TypeError):
r.scale_by_ip(scale_by=(1, 2), y=1)

def test_frect_subscript(self):
r = FRect(1.2, 2.4, 3.6, 4.8)
self.assertAlmostEqual5(r[0], 1.2)
self.assertAlmostEqual5(r[1], 2.4)
self.assertAlmostEqual5(r[2], 3.6)
self.assertAlmostEqual5(r[3], 4.8)
self.assertEqual(r[-1], r[3])
self.assertEqual(r[-2], r[2])
self.assertEqual(r[-3], r[1])
self.assertEqual(r[-4], r[0])
self.assertRaises(IndexError, r.__getitem__, 5)
self.assertRaises(IndexError, r.__getitem__, -5)
self.assertSeqAlmostEqual5(r[0:2], [1.2, 2.4])
self.assertSeqAlmostEqual5(r[0:4], [1.2, 2.4, 3.6, 4.8])
self.assertSeqAlmostEqual5(r[0:-1], [1.2, 2.4, 3.6])
self.assertSeqAlmostEqual5(r[:], [1.2, 2.4, 3.6, 4.8])
self.assertSeqAlmostEqual5(r[...], [1.2, 2.4, 3.6, 4.8])
self.assertEqual(r[0:4], r)
self.assertEqual(r[:], r)
self.assertEqual(r[...], r)
self.assertSeqAlmostEqual5(r[0:4:2], [1.2, 3.6])
self.assertSeqAlmostEqual5(r[0:4:3], [1.2, 4.8])
self.assertSeqAlmostEqual5(r[3::-1], [4.8, 3.6, 2.4, 1.2])
self.assertRaises(TypeError, r.__getitem__, None)


class SubclassTest(unittest.TestCase):
class MyRect(Rect):
Expand Down