Fix a problem in Tkinter introduced by SF patch #869468 (checked in as

1.179): delete bogus __hasattr__ and __delattr__ methods on class Tk
that were breaking Tkdnd.

diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index 81bf465de1d1437adc962430ebc2715b0722e875..d33de0b80495c9dcbdd7c00279da570c29948edd 100644 (file)
--- a/Lib/lib-tk/Tkinter.py
+++ b/Lib/lib-tk/Tkinter.py
@@ -1652,12 +1652,6 @@ class Tk(Misc, Wm):
     def __getattr__(self, attr):
         "Delegate attribute access to the interpreter object"
         return getattr(self.tk, attr)
-    def __hasattr__(self, attr):
-        "Delegate attribute access to the interpreter object"
-        return hasattr(self.tk, attr)
-    def __delattr__(self, attr):
-        "Delegate attribute access to the interpreter object"
-        return delattr(self.tk, attr)
 
 # Ideally, the classes Pack, Place and Grid disappear, the
 # pack/place/grid methods are defined on the Widget class, and

diff --git a/Misc/NEWS b/Misc/NEWS
index e457fa19ff182827dbee45dcdc2b016b42d949a2..44ea538e9a8e02b985a9e76a0aeb6d91a2bd8df3 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,10 @@ What's New in Python 2.5 alpha 1?
 Core and builtins
 -----------------
 
+- Fix a problem in Tkinter introduced by SF patch #869468: delete bogus
+  __hasattr__ and __delattr__ methods on class Tk that were breaking
+  Tkdnd.
+
 - SF bug #1238681:  freed pointer is used in longobject.c:long_pow().
 
 - SF bug #1229429: PyObject_CallMethod failed to decrement some