From: Fred Drake <fdrake@acm.org>
Date: Tue, 27 May 1997 22:45:10 +0000 (+0000)
Subject: Widget._setup():  Support name=None in a similar way to the handling of other
X-Git-Tag: v1.5a3~429
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8296db67df8955580be1fbb0ac5754b3c396107;p=thirdparty%2FPython%2Fcpython.git

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 d567467fa551..9d5fa6f61e78 100644
--- 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 d567467fa551..9d5fa6f61e78 100755
--- 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=='.':