https://github.com/python/cpython/commit/c61cb507c10c5b597928284e087a9a384ab267d0
commit: c61cb507c10c5b597928284e087a9a384ab267d0
branch: main
author: Serhiy Storchaka <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2024-03-16T13:31:19+02:00
summary:
gh-116484: Fix collisions between Checkbutton and ttk.Checkbutton default names
(GH-116495)
Change automatically generated tkinter.Checkbutton widget names to
avoid collisions with automatically generated tkinter.ttk.Checkbutton
widget names within the same parent widget.
files:
A Misc/NEWS.d/next/Library/2024-03-08-11-31-49.gh-issue-116484.VMAsU7.rst
M Lib/test/test_ttk/test_widgets.py
M Lib/tkinter/__init__.py
diff --git a/Lib/test/test_ttk/test_widgets.py
b/Lib/test/test_ttk/test_widgets.py
index fd1a748a498ac5..e3e440c45859f7 100644
--- a/Lib/test/test_ttk/test_widgets.py
+++ b/Lib/test/test_ttk/test_widgets.py
@@ -285,9 +285,29 @@ def test_unique_variables(self):
b.pack()
buttons.append(b)
variables = [str(b['variable']) for b in buttons]
- print(variables)
self.assertEqual(len(set(variables)), 4, variables)
+ def test_unique_variables2(self):
+ buttons = []
+ f = ttk.Frame(self.root)
+ f.pack()
+ f = ttk.Frame(self.root)
+ f.pack()
+ for j in 'AB':
+ b = tkinter.Checkbutton(f, text=j)
+ b.pack()
+ buttons.append(b)
+ # Should be larger than the number of all previously created
+ # tkinter.Checkbutton widgets:
+ for j in range(100):
+ b = ttk.Checkbutton(f, text=str(j))
+ b.pack()
+ buttons.append(b)
+ names = [str(b) for b in buttons]
+ self.assertEqual(len(set(names)), len(buttons), names)
+ variables = [str(b['variable']) for b in buttons]
+ self.assertEqual(len(set(variables)), len(buttons), variables)
+
@add_standard_options(IntegerSizeTests, StandardTtkOptionsTests)
class EntryTest(AbstractWidgetTest, unittest.TestCase):
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
index 175bfbd7d912d2..fd7b48e3519990 100644
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -3166,11 +3166,16 @@ def __init__(self, master=None, cnf={}, **kw):
Widget.__init__(self, master, 'checkbutton', cnf, kw)
def _setup(self, master, cnf):
+ # Because Checkbutton defaults to a variable with the same name as
+ # the widget, Checkbutton default names must be globally unique,
+ # not just unique within the parent widget.
if not cnf.get('name'):
global _checkbutton_count
name = self.__class__.__name__.lower()
_checkbutton_count += 1
- cnf['name'] = f'!{name}{_checkbutton_count}'
+ # To avoid collisions with ttk.Checkbutton, use the different
+ # name template.
+ cnf['name'] = f'!{name}-{_checkbutton_count}'
super()._setup(master, cnf)
def deselect(self):
diff --git
a/Misc/NEWS.d/next/Library/2024-03-08-11-31-49.gh-issue-116484.VMAsU7.rst
b/Misc/NEWS.d/next/Library/2024-03-08-11-31-49.gh-issue-116484.VMAsU7.rst
new file mode 100644
index 00000000000000..265c3810466d39
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-03-08-11-31-49.gh-issue-116484.VMAsU7.rst
@@ -0,0 +1,3 @@
+Change automatically generated :class:`tkinter.Checkbutton` widget names to
+avoid collisions with automatically generated
+:class:`tkinter.ttk.Checkbutton` widget names within the same parent widget.
_______________________________________________
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]
