summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2005-07-26 23:57:46 (GMT)
committerGuido van Rossum <guido@python.org>2005-07-26 23:57:46 (GMT)
commit49a4b68b8b5dde8773247c4a2c8677a9455d8558 (patch)
tree014c1e3cb7c2961229939c63aab8a96adaa75e92
parent8321b42f38e7456b88e7b08e8b2d8c2dfb041093 (diff)
downloadcpython-49a4b68b8b5dde8773247c4a2c8677a9455d8558.zip
cpython-49a4b68b8b5dde8773247c4a2c8677a9455d8558.tar.gz
cpython-49a4b68b8b5dde8773247c4a2c8677a9455d8558.tar.bz2
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.
-rw-r--r--Lib/lib-tk/Tkinter.py6
-rw-r--r--Misc/NEWS4
2 files changed, 4 insertions, 6 deletions
diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index 81bf465..d33de0b 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 e457fa1..44ea538 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