Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 34d11f0

Browse files
committed
Fixed multi-arg appends.
1 parent 9de9883 commit 34d11f0

12 files changed

Lines changed: 15 additions & 14 deletions

File tree

Mac/Demo/PICTbrowse/ICONbrowse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def findICONresources(self):
7070
finally:
7171
Res.SetResLoad(1)
7272
id, type, name = r.GetResInfo()
73-
rv.append(id, name)
73+
rv.append((id, name))
7474
return rv
7575

7676
class ICONwindow(FrameWork.Window):

Mac/Demo/PICTbrowse/PICTbrowse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def findPICTresources(self):
6565
finally:
6666
Res.SetResLoad(1)
6767
id, type, name = r.GetResInfo()
68-
rv.append(id, name)
68+
rv.append((id, name))
6969
return rv
7070

7171
class PICTwindow(FrameWork.Window):

Mac/Demo/PICTbrowse/PICTbrowse2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def findPICTresources(self):
6969
finally:
7070
Res.SetResLoad(1)
7171
id, type, name = r.GetResInfo()
72-
rv.append(id, name)
72+
rv.append((id, name))
7373
return rv
7474

7575
class PICTwindow(FrameWork.Window):

Mac/Demo/PICTbrowse/cicnbrowse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def findcicnresources(self):
7070
finally:
7171
Res.SetResLoad(1)
7272
id, type, name = r.GetResInfo()
73-
rv.append(id, name)
73+
rv.append((id, name))
7474
return rv
7575

7676
class CIconwindow(FrameWork.Window):

Mac/Demo/PICTbrowse/oldPICTbrowse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def findPICTresources(self):
6464
finally:
6565
Res.SetResLoad(1)
6666
id, type, name = r.GetResInfo()
67-
rv.append(id, name)
67+
rv.append((id, name))
6868
return rv
6969

7070
class PICTwindow(FrameWork.Window):

Mac/Demo/speech/grail.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def readscript(file):
7777
for i in range(len(lines)):
7878
tp, data = parseline(lines[i])
7979
if tp == NEWSCENE:
80-
acts.append(actor_dict.keys(), lines[prev_act:i])
80+
acts.append((actor_dict.keys(), lines[prev_act:i]))
8181
prev_act = i
8282
actor_dict = {}
8383
elif tp == TEXT:

Mac/Lib/FrameWork.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,7 @@ def __init__(self, bar, title, after=0):
512512
def delete(self):
513513
self.bar.delmenu(self.id)
514514
del self.bar.menus[self.id]
515+
self.menu.DisposeMenu()
515516
del self.bar
516517
del self.items
517518
del self.menu
@@ -520,7 +521,7 @@ def delete(self):
520521

521522
def additem(self, label, shortcut=None, callback=None, kind=None):
522523
self.menu.AppendMenu('x') # add a dummy string
523-
self.items.append(label, shortcut, callback, kind)
524+
self.items.append((label, shortcut, callback, kind))
524525
item = len(self.items)
525526
self.menu.SetMenuItemText(item, label) # set the actual text
526527
if shortcut and type(shortcut) == type(()):
@@ -547,7 +548,7 @@ def addradio(self, label, shortcut=None, callback=None):
547548

548549
def addseparator(self):
549550
self.menu.AppendMenu('(-')
550-
self.items.append('', None, None, 'separator')
551+
self.items.append(('', None, None, 'separator'))
551552

552553
def addsubmenu(self, label, title=''):
553554
sub = Menu(self.bar, title, -1)

Mac/Tools/IDE/PythonIDEMain.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def makeopenwindowsmenu(self):
204204
title = window.GetWTitle()
205205
if not title:
206206
title = "<no title>"
207-
windows.append(title, window)
207+
windows.append((title, window))
208208
windows.sort()
209209
for title, window in windows:
210210
if title == "Python Interactive": # ugly but useful hack by Joe Strout

Mac/Tools/IDE/Wbase.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ def setuppanes(self):
490490
for panesize in panesizes:
491491
if current:
492492
self._gutters.append(current)
493-
self._panesizes.append(current, current + panesize)
493+
self._panesizes.append((current, current + panesize))
494494
current = current + panesize
495495
self.makepanebounds()
496496

Mac/Tools/twit/mactwit_browser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ def do_rightbutton(self, force = 0):
300300
self.scroll(-1)
301301
point = (0, 0)
302302
ok, point = self.lists[0].list.LGetSelect(1, point)
303-
self.leftover.append(point, self.lists[0].content, self.lists[0].title, self.lists[0].active)
303+
self.leftover.append((point, self.lists[0].content, self.lists[0].title, self.lists[0].active))
304304
for i in range(len(self.lists)-1):
305305
point = (0, 0)
306306
ok, point = self.lists[i+1].list.LGetSelect(1, point)
@@ -331,7 +331,7 @@ def do_leftbutton(self):
331331
if self.lists[-1].content <> None:
332332
point = (0, 0)
333333
ok, point = self.lists[-1].list.LGetSelect(1, point)
334-
self.rightover.append(point, self.lists[-1].content, self.lists[-1].title, self.lists[-1].active )
334+
self.rightover.append((point, self.lists[-1].content, self.lists[-1].title, self.lists[-1].active ))
335335
for i in range(len(self.lists)-1, 0, -1):
336336
point = (0, 0)
337337
ok, point = self.lists[i-1].list.LGetSelect(1, point)

0 commit comments

Comments
 (0)