diff options
| author | E-Paine <63801254+E-Paine@users.noreply.github.com> | 2021-10-21 20:25:52 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-21 20:25:52 (GMT) |
| commit | add46f84769a7e6fafa50954f79b7c248231fa4e (patch) | |
| tree | 1edd956baa6df75326b964a6bedddedd02a9abb8 | |
| parent | 0c4c2e6213f348dc98a787e385cde0a480e80ee9 (diff) | |
| download | cpython-add46f84769a7e6fafa50954f79b7c248231fa4e.zip cpython-add46f84769a7e6fafa50954f79b7c248231fa4e.tar.gz cpython-add46f84769a7e6fafa50954f79b7c248231fa4e.tar.bz2 | |
bpo-45160: Ttk optionmenu only set variable once (GH-28291)
| -rw-r--r-- | Lib/tkinter/test/test_ttk/test_extensions.py | 13 | ||||
| -rw-r--r-- | Lib/tkinter/ttk.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2021-09-11-14-47-05.bpo-45160.VzMXbW.rst | 1 |
3 files changed, 18 insertions, 1 deletions
diff --git a/Lib/tkinter/test/test_ttk/test_extensions.py b/Lib/tkinter/test/test_ttk/test_extensions.py index 438d21d..cddd1f2 100644 --- a/Lib/tkinter/test/test_ttk/test_extensions.py +++ b/Lib/tkinter/test/test_ttk/test_extensions.py @@ -301,6 +301,19 @@ class OptionMenuTest(AbstractTkTest, unittest.TestCase): optmenu.destroy() optmenu2.destroy() + def test_trace_variable(self): + # prior to bpo45160, tracing a variable would cause the callback to be made twice + success = [] + items = ('a', 'b', 'c') + textvar = tkinter.StringVar(self.root) + def cb_test(*args): + self.assertEqual(textvar.get(), items[1]) + success.append(True) + optmenu = ttk.OptionMenu(self.root, textvar, "a", *items) + textvar.trace("w", cb_test) + optmenu['menu'].invoke(1) + self.assertEqual(success, [True]) + class DefaultRootTest(AbstractDefaultRootTest, unittest.TestCase): diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py index b854235..acdd565 100644 --- a/Lib/tkinter/ttk.py +++ b/Lib/tkinter/ttk.py @@ -1643,7 +1643,10 @@ class OptionMenu(Menubutton): menu.delete(0, 'end') for val in values: menu.add_radiobutton(label=val, - command=tkinter._setit(self._variable, val, self._callback), + command=( + None if self._callback is None + else lambda val=val: self._callback(val) + ), variable=self._variable) if default: diff --git a/Misc/NEWS.d/next/Library/2021-09-11-14-47-05.bpo-45160.VzMXbW.rst b/Misc/NEWS.d/next/Library/2021-09-11-14-47-05.bpo-45160.VzMXbW.rst new file mode 100644 index 0000000..9d11ed0 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-09-11-14-47-05.bpo-45160.VzMXbW.rst @@ -0,0 +1 @@ +When tracing a tkinter variable used by a ttk OptionMenu, callbacks are no longer made twice.
\ No newline at end of file |