8000 [3.10] gh-73588: Fix generation of the default name of tkinter.Checkbutton. (GH-97547) by miss-islington · Pull Request #97596 · python/cpython · GitHub
[go: up one dir, main page]

Skip to content

[3.10] gh-73588: Fix generation of the default name of tkinter.Checkbutton. (GH-97547) #97596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion Lib/tkinter/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2592,7 +2592,7 @@ def __init__(self, master, widgetName, cnf={}, kw={}, extra=()):
if kw:
cnf = _cnfmerge((cnf, kw))
self.widgetName = widgetName
BaseWidget._setup(self, master, cnf)
self._setup(master, cnf)
if self._tclCommands is None:
self._tclCommands = []
classes = [(k, v) for k, v in cnf.items() if isinstance(k, type)]
Expand Down Expand Up @@ -3011,6 +3011,8 @@ def type(self, tagOrId):
return self.tk.call(self._w, 'type', tagOrId) or None


_checkbutton_count = 0

class Checkbutton(Widget):
"""Checkbutton widget which is either in on- or off-state."""

Expand All @@ -3026,6 +3028,14 @@ def __init__(self, master=None, cnf={}, **kw):
underline, variable, width, wraplength."""
Widget.__init__(self, master, 'checkbutton', cnf, kw)

def _setup(self, master, cnf):
if not cnf.get('name'):
global _checkbutton_count
name = self.__class__.__name__.lower()
_checkbutton_count += 1
cnf['name'] = f'!{name}{_checkbutton_count}'
super()._setup(master, cnf)

def deselect(self):
"""Put the button in off-state."""
self.tk.call(self._w, 'deselect')
Expand Down
2 changes: 1 addition & 1 deletion Lib/tkinter/dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Dialog(Widget):
def __init__(self, master=None, cnf={}, **kw):
cnf = _cnfmerge((cnf, kw))
self.widgetName = '__dialog__'
Widget._setup(self, master, cnf)
self._setup(master, cnf)
self.num = self.tk.getint(
self.tk.call(
'tk_dialog', self._w,
Expand Down
26 changes: 26 additions & 0 deletions Lib/tkinter/test/test_tkinter/test_widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,32 @@ def test_configure_onvalue(self):
widget = self.create()
self.checkParams(widget, 'onvalue', 1, 2.3, '', 'any string')

def test_unique_variables(self):
frames = []
buttons = []
for i in range(2):
f = tkinter.Frame(self.root)
f.pack()
frames.append(f)
for j in 'AB':
b = tkinter.Checkbutton(f, text=j)
b.pack()
buttons.append(b)
variables = [str(b['variable']) for b in buttons]
self.assertEqual(len(set(variables)), 4, variables)

def test_same_name(self):
f1 = tkinter.Frame(self.root)
f2 = tkinter.Frame(self.root)
b1 = tkinter.Checkbutton(f1, name='test', text='Test1')
b2 = tkinter.Checkbutton(f2, name='test', text='Test2')

v = tkinter.IntVar(self.root, name='test')
b1.select()
self.assertEqual(v.get(), 1)
b2.deselect()
self.assertEqual(v.get(), 0)


@add_standard_options(StandardOptionsTests)
class RadiobuttonTest(AbstractLabelTest, unittest.TestCase):
Expand Down
15 changes: 15 additions & 0 deletions Lib/tkinter/test/test_ttk/test_widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,21 @@ def cb_test():
self.assertEqual(cbtn['offvalue'],
cbtn.tk.globalgetvar(cbtn['variable']))

def test_unique_variables(self):
frames = []
buttons = []
for i in range(2):
f = ttk.Frame(self.root)
f.pack()
frames.append(f)
for j in 'AB':
b = ttk.Checkbutton(f, text=j)
b.pack()
buttons.append(b)
variables = [str(b['variable']) for b in buttons]
print(variables)
self.assertEqual(len(set(variables)), 4, variables)


@add_standard_options(IntegerSizeTests, StandardTtkOptionsTests)
class EntryTest(AbstractWidgetTest, unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion Lib/tkinter/tix.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ def __init__ (self, master=None, widgetName=None,
del cnf[k]

self.widgetName = widgetName
Widget._setup(self, master, cnf)
self._setup(master, cnf)

# If widgetName is None, this is a dummy creation call where the
# corresponding Tk widget has already been created by Tix
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Fix generation of the default name of :class:`tkinter.Checkbutton`.
Previously, checkbuttons in different parent widgets could have the same
short name and share the same state if arguments "name" and "variable" are
not specified. Now they are globally unique.
0