diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py index 81bf465de1d..d33de0b8049 100644 --- a/Lib/lib-tk/Tkinter.py +++ b/Lib/lib-tk/Tkinter.py @@ -1652,12 +1652,6 @@ def report_callback_exception(self, exc, val, tb): 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 e457fa19ff1..44ea538e9a8 100644 --- 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