https://github.com/python/cpython/commit/e875c2d752fed0a8d16958dc7b331e66a2476247
commit: e875c2d752fed0a8d16958dc7b331e66a2476247
branch: main
author: Serhiy Storchaka <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2024-05-30T17:22:52Z
summary:
gh-119791: Fix new Tkinter tests for wantobjects=0 (GH-119792)
PhotoImage.get() retruns a string instead of a 3-tuple of integers
in this case.
files:
M Lib/test/test_tkinter/test_images.py
diff --git a/Lib/test/test_tkinter/test_images.py
b/Lib/test/test_tkinter/test_images.py
index b8e549e314d27d..38371fe00d6eb5 100644
--- a/Lib/test/test_tkinter/test_images.py
+++ b/Lib/test/test_tkinter/test_images.py
@@ -581,13 +581,15 @@ def test_write(self):
image.write(filename, background='#ff0000')
image4 = tkinter.PhotoImage('::img::test4', master=self.root,
format='ppm', file=filename)
- self.assertEqual(image4.get(0, 0), (255, 0, 0))
+ self.assertEqual(image4.get(0, 0), (255, 0, 0) if self.wantobjects
else '255 0 0')
self.assertEqual(image4.get(4, 6), image.get(4, 6))
image.write(filename, grayscale=True)
image5 = tkinter.PhotoImage('::img::test5', master=self.root,
format='ppm', file=filename)
c = image5.get(4, 6)
+ if not self.wantobjects:
+ c = c.split()
self.assertTrue(c[0] == c[1] == c[2], c)
def test_data(self):
@@ -597,7 +599,10 @@ def test_data(self):
self.assertIsInstance(data, tuple)
for row in data:
self.assertIsInstance(row, str)
- self.assertEqual(data[6].split()[4], '#%02x%02x%02x' % image.get(4, 6))
+ c = image.get(4, 6)
+ if not self.wantobjects:
+ c = tuple(map(int, c.split()))
+ self.assertEqual(data[6].split()[4], '#%02x%02x%02x' % c)
data = image.data('ppm')
image2 = tkinter.PhotoImage('::img::test2', master=self.root,
@@ -622,13 +627,15 @@ def test_data(self):
data = image.data('ppm', background='#ff0000')
image4 = tkinter.PhotoImage('::img::test4', master=self.root,
format='ppm', data=data)
- self.assertEqual(image4.get(0, 0), (255, 0, 0))
+ self.assertEqual(image4.get(0, 0), (255, 0, 0) if self.wantobjects
else '255 0 0')
self.assertEqual(image4.get(4, 6), image.get(4, 6))
data = image.data('ppm', grayscale=True)
image5 = tkinter.PhotoImage('::img::test5', master=self.root,
format='ppm', data=data)
c = image5.get(4, 6)
+ if not self.wantobjects:
+ c = c.split()
self.assertTrue(c[0] == c[1] == c[2], c)
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
