From: Guido van Rossum <guido@python.org>
Date: Tue, 26 Jul 2005 23:59:58 +0000 (+0000)
Subject: (Backport)
X-Git-Tag: v2.4.2c1~115
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64da727305e0c0dc13862661b4973dbc904fc937;p=thirdparty%2FPython%2Fcpython.git

(Backport)
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 81bf465de1d1..d33de0b80495 100644
--- 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 1c99a82d9424..1eb846c4b91c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -53,6 +53,10 @@ Extension Modules
 Library
 -------
 
+- Fix a problem in Tkinter introduced by SF patch #869468: delete bogus
+  __hasattr__ and __delattr__ methods on class Tk that were breaking
+  Tkdnd.
+
 - Bug #1015140: disambiguated the term "article id" in nntplib docs and
   docstrings to either "article number" or "message id".