Very minor little things... -- jvr

Just van Rossum · Just van Rossum · commit 7171df3e7e48 · 1999-10-30T11:46:18.000Z
diff --git a/Mac/Tools/IDE/Wapplication.py b/Mac/Tools/IDE/Wapplication.py
@@ -245,8 +245,13 @@ def makemenubar(self):
 		self.menubar = MenuBar(self)
 		FrameWork.AppleMenu(self.menubar, self.getabouttext(), self.do_about)
 		self.makeusermenus()
-
-	def scriptswalk(self, top, menu):
+	
+	def scriptswalk(self, top, menu, done=None):
+		if done is None:
+			done = {}
+		if done.has_key(top):
+			return
+		done[top] = 1
 		import os, macfs, string
 		try:
 			names = os.listdir(top)
@@ -258,19 +263,22 @@ def scriptswalk(self, top, menu):
 		for name in names:
 			fss, isdir, isalias = macfs.ResolveAliasFile(name)
 			path = fss.as_pathname()
+			if done.has_key(path):
+				continue
 			name = string.strip(name)
 			if name[-3:] == '---':
 				menu.addseparator()
 			elif isdir:
 				submenu = FrameWork.SubMenu(menu, name)
-				self.scriptswalk(path, submenu)
+				self.scriptswalk(path, submenu, done)
 			else:
 				creator, type = fss.GetCreatorType()
 				if type == 'TEXT':
 					if name[-3:] == '.py':
 						name = name[:-3]
 					item = FrameWork.MenuItem(menu, name, None, self.domenu_script)
 					self._scripts[(menu.id, item.item)] = path
+			done[path] = 1
 		os.chdir(savedir)
 	
 	def domenu_script(self, id, item, window, event):
@@ -352,7 +360,8 @@ def getscript(self, filename):
 		import string
 		lowpath = string.lower(filename)
 		for wid, window in self._windows.items():
-			if hasattr(window, "path") and lowpath == string.lower(window.path):
+			if hasattr(window, "path") and type(window.path) == StringType and \
+					lowpath == string.lower(window.path):
 				return window
 			elif hasattr(window, "path") and filename == wid.GetWTitle():
 				return window
