[3.12] pythongh-128014: Fix passing default='' to the tkinter method …

…wm_iconbitmap() (pythonGH-128015) (cherry picked from commit 58e9f95) Co-authored-by: Zhikang Yan <[email protected]> Co-authored-by: Serhiy Storchaka <[email protected]>
serhiy-storchaka · Jan 2, 2025 · 3a08cc9 · 3a08cc9
1 parent 52c08ed
commit 3a08cc9
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/Lib/test/test_tkinter/test_misc.py b/Lib/test/test_tkinter/test_misc.py
@@ -3,7 +3,8 @@
 import tkinter
 import enum
 from test import support
-from test.test_tkinter.support import AbstractTkTest, AbstractDefaultRootTest
+from test.test_tkinter.support import (AbstractTkTest, AbstractDefaultRootTest,
+                                       requires_tk, get_tk_patchlevel)
 
 support.requires('gui')
 
@@ -392,6 +393,34 @@ def test_embedded_null(self):
         self.assertEqual(widget.selection_get(), '\u20ac\0abc\x00def')
 
 
+class WmTest(AbstractTkTest, unittest.TestCase):
+
+    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):
 
     def test_focus(self):

diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
@@ -2150,7 +2150,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)

diff --git a/Misc/NEWS.d/next/Library/2024-12-18-00-07-50.gh-issue-128014.F3aUbz.rst b/Misc/NEWS.d/next/Library/2024-12-18-00-07-50.gh-issue-128014.F3aUbz.rst
@@ -0,0 +1,2 @@
+Fix resetting the default window icon by passing ``default=''`` to the
+:mod:`tkinter` method :meth:`!wm_iconbitmap`.
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`.