From 58e9f95c4aa970db32a94b9152b51ede22f823bd Mon Sep 17 00:00:00 2001
From: Zhikang Yan <2951256653@qq.com>
Date: Thu, 2 Jan 2025 23:51:57 +0800
Subject: gh-128014: Fix passing default='' to the tkinter method
wm_iconbitmap() (GH-128015)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---
Lib/test/test_tkinter/test_misc.py | 28 +++++++++++++++++++++-
Lib/tkinter/__init__.py | 2 +-
.../2024-12-18-00-07-50.gh-issue-128014.F3aUbz.rst | 2 ++
3 files changed, 30 insertions(+), 2 deletions(-)
create mode 100644 Misc/NEWS.d/next/Library/2024-12-18-00-07-50.gh-issue-128014.F3aUbz.rst
diff --git a/Lib/test/test_tkinter/test_misc.py b/Lib/test/test_tkinter/test_misc.py
index 475edcb..3362169 100644
--- a/Lib/test/test_tkinter/test_misc.py
+++ b/Lib/test/test_tkinter/test_misc.py
@@ -4,7 +4,8 @@ import tkinter
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')
@@ -554,6 +555,31 @@ class WmTest(AbstractTkTest, unittest.TestCase):
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):
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
index bfec04b..d494c0c 100644
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -2265,7 +2265,7 @@ class Wm:
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
new file mode 100644
index 0000000..ef339a2
--- /dev/null
+++ 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`.
--
cgit v0.12