diff options
| author | csabella <cheryl.sabella@gmail.com> | 2017-07-31 09:30:09 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2017-07-31 09:30:09 (GMT) |
| commit | a568e5273382a5dca0c27274f7d8e34c41a87d4d (patch) | |
| tree | 6fa43e8c6a12bbea985daa66c8e16f7884051169 | |
| parent | e8eb17b2c11dcd1550a94b175e557c234a804482 (diff) | |
| download | cpython-a568e5273382a5dca0c27274f7d8e34c41a87d4d.zip cpython-a568e5273382a5dca0c27274f7d8e34c41a87d4d.tar.gz cpython-a568e5273382a5dca0c27274f7d8e34c41a87d4d.tar.bz2 | |
bpo-25684: ttk.OptionMenu radiobuttons weren't unique (#2276)
between instances of OptionMenu.
| -rw-r--r-- | Lib/tkinter/test/test_ttk/test_extensions.py | 25 | ||||
| -rw-r--r-- | Lib/tkinter/ttk.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2017-07-17-11-35-00.bpo-25684.usELVx.rst | 2 |
3 files changed, 29 insertions, 1 deletions
diff --git a/Lib/tkinter/test/test_ttk/test_extensions.py b/Lib/tkinter/test/test_ttk/test_extensions.py index 218b27f..a45f882 100644 --- a/Lib/tkinter/test/test_ttk/test_extensions.py +++ b/Lib/tkinter/test/test_ttk/test_extensions.py @@ -291,6 +291,31 @@ class OptionMenuTest(AbstractTkTest, unittest.TestCase): optmenu.destroy() + def test_unique_radiobuttons(self): + # check that radiobuttons are unique across instances (bpo25684) + items = ('a', 'b', 'c') + default = 'a' + optmenu = ttk.OptionMenu(self.root, self.textvar, default, *items) + textvar2 = tkinter.StringVar(self.root) + optmenu2 = ttk.OptionMenu(self.root, textvar2, default, *items) + optmenu.pack() + optmenu.wait_visibility() + optmenu2.pack() + optmenu2.wait_visibility() + optmenu['menu'].invoke(1) + optmenu2['menu'].invoke(2) + optmenu_stringvar_name = optmenu['menu'].entrycget(0, 'variable') + optmenu2_stringvar_name = optmenu2['menu'].entrycget(0, 'variable') + self.assertNotEqual(optmenu_stringvar_name, + optmenu2_stringvar_name) + self.assertEqual(self.root.tk.globalgetvar(optmenu_stringvar_name), + items[1]) + self.assertEqual(self.root.tk.globalgetvar(optmenu2_stringvar_name), + items[2]) + + optmenu.destroy() + optmenu2.destroy() + tests_gui = (LabeledScaleTest, OptionMenuTest) diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py index cbaad76..3ecc004 100644 --- a/Lib/tkinter/ttk.py +++ b/Lib/tkinter/ttk.py @@ -1635,7 +1635,8 @@ 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=tkinter._setit(self._variable, val, self._callback), + variable=self._variable) if default: self._variable.set(default) diff --git a/Misc/NEWS.d/next/Library/2017-07-17-11-35-00.bpo-25684.usELVx.rst b/Misc/NEWS.d/next/Library/2017-07-17-11-35-00.bpo-25684.usELVx.rst new file mode 100644 index 0000000..61d6b29 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-07-17-11-35-00.bpo-25684.usELVx.rst @@ -0,0 +1,2 @@ +Change ``ttk.OptionMenu`` radiobuttons to be unique across instances of +``OptionMenu``. |