mirror of
https://github.com/python/cpython
synced 2024-09-05 16:38:56 +00:00
gh-100814: Fix exception for invalid callable value of Tkinter image option (GH-107692)
Passing a callable object as an option value to a Tkinter image now raises the expected TclError instead of an AttributeError.
This commit is contained in:
parent
835e388915
commit
50e3cc9748
|
@ -144,6 +144,14 @@ def test_configure_foreground(self):
|
|||
self.assertEqual(image['foreground'],
|
||||
'-foreground {} {} #000000 yellow')
|
||||
|
||||
def test_bug_100814(self):
|
||||
# gh-100814: Passing a callable option value causes AttributeError.
|
||||
with self.assertRaises(tkinter.TclError):
|
||||
tkinter.BitmapImage('::img::test', master=self.root, spam=print)
|
||||
image = tkinter.BitmapImage('::img::test', master=self.root)
|
||||
with self.assertRaises(tkinter.TclError):
|
||||
image.configure(spam=print)
|
||||
|
||||
|
||||
class PhotoImageTest(AbstractTkTest, unittest.TestCase):
|
||||
|
||||
|
@ -274,6 +282,14 @@ def test_configure_palette(self):
|
|||
image.configure(palette='3/4/2')
|
||||
self.assertEqual(image['palette'], '3/4/2')
|
||||
|
||||
def test_bug_100814(self):
|
||||
# gh-100814: Passing a callable option value causes AttributeError.
|
||||
with self.assertRaises(tkinter.TclError):
|
||||
tkinter.PhotoImage('::img::test', master=self.root, spam=print)
|
||||
image = tkinter.PhotoImage('::img::test', master=self.root)
|
||||
with self.assertRaises(tkinter.TclError):
|
||||
image.configure(spam=print)
|
||||
|
||||
def test_blank(self):
|
||||
image = self.create()
|
||||
image.blank()
|
||||
|
|
|
@ -4069,8 +4069,6 @@ def __init__(self, imgtype, name=None, cnf={}, master=None, **kw):
|
|||
elif kw: cnf = kw
|
||||
options = ()
|
||||
for k, v in cnf.items():
|
||||
if callable(v):
|
||||
v = self._register(v)
|
||||
options = options + ('-'+k, v)
|
||||
self.tk.call(('image', 'create', imgtype, name,) + options)
|
||||
self.name = name
|
||||
|
@ -4097,8 +4095,6 @@ def configure(self, **kw):
|
|||
for k, v in _cnfmerge(kw).items():
|
||||
if v is not None:
|
||||
if k[-1] == '_': k = k[:-1]
|
||||
if callable(v):
|
||||
v = self._register(v)
|
||||
res = res + ('-'+k, v)
|
||||
self.tk.call((self.name, 'config') + res)
|
||||
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Passing a callable object as an option value to a Tkinter image now raises
|
||||
the expected TclError instead of an AttributeError.
|
Loading…
Reference in a new issue