Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-128014: fix handling of a default empty string passed to tkinter.Wm.wm_iconbitmap #128015

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.

Sign up for GitHub

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 10 commits into from
Jan 2, 2025
Merged

gh-128014: fix handling of a default empty string passed to tkinter.Wm.wm_iconbitmap #128015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
18f07ce
fix: Fix the bug that the parameter `default` of `tkinter.Wm.iconbitm…
Xiaokang2022 Dec 17, 2024
66b1be2
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 18, 2024
39ab05c
Add a test.
serhiy-storchaka Dec 18, 2024
1c94507
Tweak NEWS entry.
serhiy-storchaka Dec 18, 2024
1126271
Merge branch 'main' into fix-tk-iconbitmap
serhiy-storchaka Dec 19, 2024
32ae76e
Merge branch 'main' into fix-tk-iconbitmap
Xiaokang2022 Dec 22, 2024
1989ada
Fix test on macOS.
serhiy-storchaka Dec 29, 2024
6aac538
Fix a typo.
serhiy-storchaka Dec 31, 2024
7c6d61a
Merge branch 'main' into fix-tk-iconbitmap
serhiy-storchaka Jan 2, 2025
42d8d3f
Skip the test depending on the Tk patchlevel.
serhiy-storchaka Jan 2, 2025
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
28 changes: 27 additions & 1 deletion Lib/test/test_tkinter/test_misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
from tkinter import TclError
import enum
from test import support
from test.test_tkinter.support import AbstractTkTest, AbstractDefaultRootTest, requires_tk
from test.test_tkinter.support import (AbstractTkTest, AbstractDefaultRootTest,
requires_tk, get_tk_patchlevel)

support.requires('gui')

Expand Down Expand Up @@ -554,6 +555,31 @@ def test_wm_attribute(self):
self.assertEqual(w.wm_attributes('alpha'),
1.0 if self.wantobjects else '1.0')

def test_wm_iconbitmap(self):
t = tkinter.Toplevel(self.root)
self.assertEqual(t.wm_iconbitmap(), '')
t.wm_iconbitmap('hourglass')
bug = False
if t._windowingsystem == 'aqua':
# Tk bug 13ac26b35dc55f7c37f70b39d59d7ef3e63017c8.
patchlevel = get_tk_patchlevel(t)
if patchlevel < (8, 6, 17) or (9, 0) <= patchlevel < (9, 0, 2):
bug = True
if not bug:
self.assertEqual(t.wm_iconbitmap(), 'hourglass')
self.assertEqual(self.root.wm_iconbitmap(), '')
t.wm_iconbitmap('')
self.assertEqual(t.wm_iconbitmap(), '')

if t._windowingsystem == 'win32':
t.wm_iconbitmap(default='hourglass')
self.assertEqual(t.wm_iconbitmap(), 'hourglass')
self.assertEqual(self.root.wm_iconbitmap(), '')
t.wm_iconbitmap(default='')
self.assertEqual(t.wm_iconbitmap(), '')

t.destroy()


class EventTest(AbstractTkTest, unittest.TestCase):

Expand Down
2 changes: 1 addition & 1 deletion Lib/tkinter/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2265,7 +2265,7 @@ def wm_iconbitmap(self, bitmap=None, default=None):
explicitly. DEFAULT can be the relative path to a .ico file
(example: root.iconbitmap(default='myicon.ico') ). See Tk
documentation for more information."""
if default:
if default is not None:
return self.tk.call('wm', 'iconbitmap', self._w, '-default', default)
else:
return self.tk.call('wm', 'iconbitmap', self._w, bitmap)
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2024-12-18-00-07-50.gh-issue-128014.F3aUbz.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix resetting the default window icon by passing ``default=''`` to the
:mod:`tkinter` method :meth:`!wm_iconbitmap`.
Loading