Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-04 07:31:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

[3.13] gh-119791: Fix new Tkinter tests for wantobjects=0 (GH-119792) (GH-119794)

Browse source 
PhotoImage.get() retruns a string instead of a 3-tuple of integers
in this case.
(cherry picked from commit e875c2d752)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
Miss Islington (bot) 2024-05-30 21:16:57 +02:00 • committed by GitHub
parent 608cfb8b41
commit d6bede815d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/test/test_tkinter/test_images.py
View file

@ -581,13 +581,15 @@ def test_write(self):
image.write(filename, background='#ff0000') image.write(filename, background='#ff0000')
image4 = tkinter.PhotoImage('::img::test4', master=self.root, image4 = tkinter.PhotoImage('::img::test4', master=self.root,
format='ppm', file=filename) 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)) self.assertEqual(image4.get(4, 6), image.get(4, 6))
image.write(filename, grayscale=True) image.write(filename, grayscale=True)
image5 = tkinter.PhotoImage('::img::test5', master=self.root, image5 = tkinter.PhotoImage('::img::test5', master=self.root,
format='ppm', file=filename) format='ppm', file=filename)
c = image5.get(4, 6) c = image5.get(4, 6)
if not self.wantobjects:
c = c.split()
self.assertTrue(c[0] == c[1] == c[2], c) self.assertTrue(c[0] == c[1] == c[2], c)
def test_data(self): def test_data(self):
@ -597,7 +599,10 @@ def test_data(self):
self.assertIsInstance(data, tuple) self.assertIsInstance(data, tuple)
for row in data: for row in data:
self.assertIsInstance(row, str) 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') data = image.data('ppm')
image2 = tkinter.PhotoImage('::img::test2', master=self.root, image2 = tkinter.PhotoImage('::img::test2', master=self.root,
@ -622,13 +627,15 @@ def test_data(self):
data = image.data('ppm', background='#ff0000') data = image.data('ppm', background='#ff0000')
image4 = tkinter.PhotoImage('::img::test4', master=self.root, image4 = tkinter.PhotoImage('::img::test4', master=self.root,
format='ppm', data=data) 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)) self.assertEqual(image4.get(4, 6), image.get(4, 6))
data = image.data('ppm', grayscale=True) data = image.data('ppm', grayscale=True)
image5 = tkinter.PhotoImage('::img::test5', master=self.root, image5 = tkinter.PhotoImage('::img::test5', master=self.root,
format='ppm', data=data) format='ppm', data=data)
c = image5.get(4, 6) c = image5.get(4, 6)
if not self.wantobjects:
c = c.split()
self.assertTrue(c[0] == c[1] == c[2], c) self.assertTrue(c[0] == c[1] == c[2], c)