mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[3.12] gh-107705: Fix file leak in test_tkinter in the C locale (GH-110507) (GH-110857)

Browse source 
(cherry picked from commit ca0f3d858d)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
Miss Islington (bot) 2023-10-14 08:43:59 +02:00 • committed by GitHub
parent a2cc9a4c3a
commit 9a62322174
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -357,13 +357,18 @@ class PhotoImageTest(AbstractTkTest, unittest.TestCase):
self.assertRaises(tkinter.TclError, image.get, 15, 16) self.assertRaises(tkinter.TclError, image.get, 15, 16)
def test_write(self): def test_write(self):
filename = os_helper.TESTFN
import locale
if locale.getlocale()[0] is None:
# Tcl uses Latin1 in the C locale
filename = os_helper.TESTFN_ASCII
image = self.create() image = self.create()
self.addCleanup(os_helper.unlink, os_helper.TESTFN) self.addCleanup(os_helper.unlink, filename)
image.write(os_helper.TESTFN) image.write(filename)
image2 = tkinter.PhotoImage('::img::test2', master=self.root, image2 = tkinter.PhotoImage('::img::test2', master=self.root,
format='ppm', format='ppm',
file=os_helper.TESTFN) file=filename)
self.assertEqual(str(image2), '::img::test2') self.assertEqual(str(image2), '::img::test2')
self.assertEqual(image2.type(), 'photo') self.assertEqual(image2.type(), 'photo')
self.assertEqual(image2.width(), 16) self.assertEqual(image2.width(), 16)
@ -371,10 +376,10 @@ class PhotoImageTest(AbstractTkTest, unittest.TestCase):
self.assertEqual(image2.get(0, 0), image.get(0, 0)) self.assertEqual(image2.get(0, 0), image.get(0, 0))
self.assertEqual(image2.get(15, 8), image.get(15, 8)) self.assertEqual(image2.get(15, 8), image.get(15, 8))
image.write(os_helper.TESTFN, format='gif', from_coords=(4, 6, 6, 9)) image.write(filename, format='gif', from_coords=(4, 6, 6, 9))
image3 = tkinter.PhotoImage('::img::test3', master=self.root, image3 = tkinter.PhotoImage('::img::test3', master=self.root,
format='gif', format='gif',
file=os_helper.TESTFN) file=filename)
self.assertEqual(str(image3), '::img::test3') self.assertEqual(str(image3), '::img::test3')
self.assertEqual(image3.type(), 'photo') self.assertEqual(image3.type(), 'photo')
self.assertEqual(image3.width(), 2) self.assertEqual(image3.width(), 2)