Fixed multi-arg appends.

12 files changed, 15 insertions, 14 deletions

diff --git a/Mac/Demo/PICTbrowse/ICONbrowse.py b/Mac/Demo/PICTbrowse/ICONbrowse.py
index f5ea93b..4e20b7f 100644
--- a/Mac/Demo/PICTbrowse/ICONbrowse.py
+++ b/Mac/Demo/PICTbrowse/ICONbrowse.py
@@ -70,7 +70,7 @@ class ICONbrowse(FrameWork.Application):
 			finally:
 				Res.SetResLoad(1)
 			id, type, name = r.GetResInfo()
-			rv.append(id, name)
+			rv.append((id, name))
 		return rv
 		
 class ICONwindow(FrameWork.Window):
diff --git a/Mac/Demo/PICTbrowse/PICTbrowse.py b/Mac/Demo/PICTbrowse/PICTbrowse.py
index a28837f..653dd5d 100644
--- a/Mac/Demo/PICTbrowse/PICTbrowse.py
+++ b/Mac/Demo/PICTbrowse/PICTbrowse.py
@@ -65,7 +65,7 @@ class PICTbrowse(FrameWork.Application):
 			finally:
 				Res.SetResLoad(1)
 			id, type, name = r.GetResInfo()
-			rv.append(id, name)
+			rv.append((id, name))
 		return rv
 		
 class PICTwindow(FrameWork.Window):
diff --git a/Mac/Demo/PICTbrowse/PICTbrowse2.py b/Mac/Demo/PICTbrowse/PICTbrowse2.py
index 60f1c70..31169ee 100644
--- a/Mac/Demo/PICTbrowse/PICTbrowse2.py
+++ b/Mac/Demo/PICTbrowse/PICTbrowse2.py
@@ -69,7 +69,7 @@ class PICTbrowse(FrameWork.Application):
 			finally:
 				Res.SetResLoad(1)
 			id, type, name = r.GetResInfo()
-			rv.append(id, name)
+			rv.append((id, name))
 		return rv
 		
 class PICTwindow(FrameWork.Window):
diff --git a/Mac/Demo/PICTbrowse/cicnbrowse.py b/Mac/Demo/PICTbrowse/cicnbrowse.py
index 38e3bed..67ec355 100644
--- a/Mac/Demo/PICTbrowse/cicnbrowse.py
+++ b/Mac/Demo/PICTbrowse/cicnbrowse.py
@@ -70,7 +70,7 @@ class CIconbrowse(FrameWork.Application):
 			finally:
 				Res.SetResLoad(1)
 			id, type, name = r.GetResInfo()
-			rv.append(id, name)
+			rv.append((id, name))
 		return rv
 		
 class CIconwindow(FrameWork.Window):
diff --git a/Mac/Demo/PICTbrowse/oldPICTbrowse.py b/Mac/Demo/PICTbrowse/oldPICTbrowse.py
index 9e9dcd5..70b910e 100644
--- a/Mac/Demo/PICTbrowse/oldPICTbrowse.py
+++ b/Mac/Demo/PICTbrowse/oldPICTbrowse.py
@@ -64,7 +64,7 @@ class PICTbrowse(FrameWork.Application):
 			finally:
 				Res.SetResLoad(1)
 			id, type, name = r.GetResInfo()
-			rv.append(id, name)
+			rv.append((id, name))
 		return rv
 		
 class PICTwindow(FrameWork.Window):
diff --git a/Mac/Demo/speech/grail.py b/Mac/Demo/speech/grail.py
index d926569..4f95b9a 100644
--- a/Mac/Demo/speech/grail.py
+++ b/Mac/Demo/speech/grail.py
@@ -77,7 +77,7 @@ def readscript(file):
 	for i in range(len(lines)):
 		tp, data = parseline(lines[i])
 		if tp == NEWSCENE:
-			acts.append(actor_dict.keys(), lines[prev_act:i])
+			acts.append((actor_dict.keys(), lines[prev_act:i]))
 			prev_act = i
 			actor_dict = {}
 		elif tp == TEXT:
diff --git a/Mac/Lib/FrameWork.py b/Mac/Lib/FrameWork.py
index e56679d..320f141 100644
--- a/Mac/Lib/FrameWork.py
+++ b/Mac/Lib/FrameWork.py
@@ -512,6 +512,7 @@ class Menu:
 	def delete(self):
 		self.bar.delmenu(self.id)
 		del self.bar.menus[self.id]
+		self.menu.DisposeMenu()
 		del self.bar
 		del self.items
 		del self.menu
@@ -520,7 +521,7 @@ class Menu:
 		
 	def additem(self, label, shortcut=None, callback=None, kind=None):
 		self.menu.AppendMenu('x')		# add a dummy string
-		self.items.append(label, shortcut, callback, kind)
+		self.items.append((label, shortcut, callback, kind))
 		item = len(self.items)
 		self.menu.SetMenuItemText(item, label)		# set the actual text
 		if shortcut and type(shortcut) == type(()):
@@ -547,7 +548,7 @@ class Menu:
 	
 	def addseparator(self):
 		self.menu.AppendMenu('(-')
-		self.items.append('', None, None, 'separator')
+		self.items.append(('', None, None, 'separator'))
 	
 	def addsubmenu(self, label, title=''):
 		sub = Menu(self.bar, title, -1)
diff --git a/Mac/Tools/IDE/PythonIDEMain.py b/Mac/Tools/IDE/PythonIDEMain.py
index 69223f5..a340eef 100644
--- a/Mac/Tools/IDE/PythonIDEMain.py
+++ b/Mac/Tools/IDE/PythonIDEMain.py
@@ -204,7 +204,7 @@ class PythonIDE(Wapplication.Application):
 			title = window.GetWTitle()
 			if not title:
 				title = "<no title>"
-			windows.append(title, window)
+			windows.append((title, window))
 		windows.sort()
 		for title, window in windows:
 			if title == "Python Interactive":	# ugly but useful hack by Joe Strout
diff --git a/Mac/Tools/IDE/Wbase.py b/Mac/Tools/IDE/Wbase.py
index 46a8c96..e1e71b2 100644
--- a/Mac/Tools/IDE/Wbase.py
+++ b/Mac/Tools/IDE/Wbase.py
@@ -490,7 +490,7 @@ class HorizontalPanes(Widget):
 		for panesize in panesizes:
 			if current:
 				self._gutters.append(current)
-			self._panesizes.append(current, current + panesize)
+			self._panesizes.append((current, current + panesize))
 			current = current + panesize
 		self.makepanebounds()
 	
diff --git a/Mac/Tools/twit/mactwit_browser.py b/Mac/Tools/twit/mactwit_browser.py
index 4c71146..a8968ca 100644
--- a/Mac/Tools/twit/mactwit_browser.py
+++ b/Mac/Tools/twit/mactwit_browser.py
@@ -300,7 +300,7 @@ class VarBrowser(FrameWork.DialogWindow):
 		self.scroll(-1)
 		point = (0, 0)
 		ok, point = self.lists[0].list.LGetSelect(1, point)
-		self.leftover.append(point, self.lists[0].content, self.lists[0].title, self.lists[0].active)
+		self.leftover.append((point, self.lists[0].content, self.lists[0].title, self.lists[0].active))
 		for i in range(len(self.lists)-1):
 			point = (0, 0)
 			ok, point = self.lists[i+1].list.LGetSelect(1, point)
@@ -331,7 +331,7 @@ class VarBrowser(FrameWork.DialogWindow):
 		if self.lists[-1].content <> None:
 			point = (0, 0)
 			ok, point = self.lists[-1].list.LGetSelect(1, point)
-			self.rightover.append(point, self.lists[-1].content, self.lists[-1].title, self.lists[-1].active )
+			self.rightover.append((point, self.lists[-1].content, self.lists[-1].title, self.lists[-1].active ))
 		for i in range(len(self.lists)-1, 0, -1):
 			point = (0, 0)
 			ok, point = self.lists[i-1].list.LGetSelect(1, point)
diff --git a/Mac/scripts/cfmfile.py b/Mac/scripts/cfmfile.py
index 1a50a67..5b416f6 100644
--- a/Mac/scripts/cfmfile.py
+++ b/Mac/scripts/cfmfile.py
@@ -215,7 +215,7 @@ def mergecfmfiles(inputs, output):
 			if (tp, id) in resources_done:
 				continue
 			i.saveresto(tp, id, rfork)
-			resources_done.append(tp, id)
+			resources_done.append((tp, id))
 			
 def main():
 	list = []
diff --git a/Mac/scripts/gensuitemodule.py b/Mac/scripts/gensuitemodule.py
index 53da22c..25595df 100644
--- a/Mac/scripts/gensuitemodule.py
+++ b/Mac/scripts/gensuitemodule.py
@@ -494,7 +494,7 @@ class ObjectCompiler:
 			if not name:
 				self.fp.write("# XXXX %s element %s not found!!\n"%(cname, `ecode`))
 			else:
-				elist.append(name, ename)
+				elist.append((name, ename))
 			
 		self.fp.write("%s._propdict = {\n"%cname)
 		for n in plist: