Widget._setup(): Support name=None in a similar way to the handling of other

	Tkinter keyword parameters.

diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index d567467fa551b0d226ca822a8f54e19103d82d24..9d5fa6f61e78095440c0872b56aed2735750f06e 100644 (file)
--- a/Lib/lib-tk/Tkinter.py
+++ b/Lib/lib-tk/Tkinter.py
@@ -890,10 +890,11 @@ class Widget(Misc, Pack, Place, Grid):
                        _default_root = master
                self.master = master
                self.tk = master.tk
+               name = None
                if cnf.has_key('name'):
                        name = cnf['name']
                        del cnf['name']
-               else:
+               if not name:
                        name = `id(self)`
                self._name = name
                if master._w=='.':

diff --git a/Lib/tkinter/Tkinter.py b/Lib/tkinter/Tkinter.py
index d567467fa551b0d226ca822a8f54e19103d82d24..9d5fa6f61e78095440c0872b56aed2735750f06e 100755 (executable)
--- a/Lib/tkinter/Tkinter.py
+++ b/Lib/tkinter/Tkinter.py
@@ -890,10 +890,11 @@ class Widget(Misc, Pack, Place, Grid):
                        _default_root = master
                self.master = master
                self.tk = master.tk
+               name = None
                if cnf.has_key('name'):
                        name = cnf['name']
                        del cnf['name']
-               else:
+               if not name:
                        name = `id(self)`
                self._name = name
                if master._w=='.':