Put a try-except around the "image delete" call in Image.__del__ to

avoid tracebacks when the root is destroyed before the image object.

diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index 344dd8ae23e4d910ef83699a545112577908fb7d..3e98cd6c28776d29c801d50421abc81661e6d060 100644 (file)
--- a/Lib/lib-tk/Tkinter.py
+++ b/Lib/lib-tk/Tkinter.py
@@ -4,7 +4,7 @@ __version__ = "$Revision$"
 
 import sys
 if sys.platform == "win32":
-    import FixTk # Attempt to configure Tcl/Tk without requiring PATH
+       import FixTk # Attempt to configure Tcl/Tk without requiring PATH
 import _tkinter # If this fails your Python may not be configured for Tk
 tkinter = _tkinter # b/w compat for export
 TclError = _tkinter.TclError
@@ -1827,7 +1827,11 @@ class Image:
        def __str__(self): return self.name
        def __del__(self):
                if self.name:
-                       self.tk.call('image', 'delete', self.name)
+                       try:
+                               self.tk.call('image', 'delete', self.name)
+                       except TclError:
+                               # May happen if the root was destroyed
+                               pass
        def __setitem__(self, key, value):
                self.tk.call(self.name, 'configure', '-'+key, value)
        def __getitem__(self, key):