[Python-checkins] python/dist/src/Lib/idlelib ColorDelegator.py,1.10,1.11 EditorWindow.py,1.52,1.53 MultiStatusBar.py,1.3,1.4 OutputWindow.py,1.9,1.10 Percolator.py,1.3,1.4 PyShell.py,1.79,1.80 TreeWidget.py,1.6,1.7 WidgetRedirector.py,1.2,1.3 configDialog.py,1.54,1.55 keybindingDialog.py,1.10,1.11

rhettinger@users.sourceforge.net rhettinger@users.sourceforge.net
Wed, 09 Jul 2003 11:48:27 -0700


Update of /cvsroot/python/python/dist/src/Lib/idlelib
In directory sc8-pr-cvs1:/tmp/cvs-serv8147

Modified Files:
	ColorDelegator.py EditorWindow.py MultiStatusBar.py 
	OutputWindow.py Percolator.py PyShell.py TreeWidget.py 
	WidgetRedirector.py configDialog.py keybindingDialog.py 
Log Message:
SF patch #768187:  replace apply(f, args, kwds) with f(*args, **kwds)



Index: ColorDelegator.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/ColorDelegator.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ColorDelegator.py	31 Dec 2002 15:59:14 -0000	1.10
--- ColorDelegator.py	9 Jul 2003 18:48:24 -0000	1.11
***************
*** 51,55 ****
          for tag, cnf in self.tagdefs.items():
              if cnf:
!                 apply(self.tag_configure, (tag,), cnf)
          self.tag_raise('sel')
  
--- 51,55 ----
          for tag, cnf in self.tagdefs.items():
              if cnf:
!                 self.tag_configure(tag, **cnf)
          self.tag_raise('sel')
  

Index: EditorWindow.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/EditorWindow.py,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** EditorWindow.py	12 Jun 2003 04:03:49 -0000	1.52
--- EditorWindow.py	9 Jul 2003 18:48:24 -0000	1.53
***************
*** 793,797 ****
          for event, keylist in keydefs.items():
              if keylist:
!                 apply(text.event_add, (event,) + tuple(keylist))
  
      def fill_menus(self, defs=None, keydefs=None):
--- 793,797 ----
          for event, keylist in keydefs.items():
              if keylist:
!                 text.event_add(event, *keylist)
  
      def fill_menus(self, defs=None, keydefs=None):

Index: MultiStatusBar.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/MultiStatusBar.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MultiStatusBar.py	13 Jul 2001 17:52:08 -0000	1.3
--- MultiStatusBar.py	9 Jul 2003 18:48:24 -0000	1.4
***************
*** 6,10 ****
          if master is None:
              master = Tk()
!         apply(Frame.__init__, (self, master), kw)
          self.labels = {}
  
--- 6,10 ----
          if master is None:
              master = Tk()
!         Frame.__init__(self, master, **kw)
          self.labels = {}
  

Index: OutputWindow.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/OutputWindow.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** OutputWindow.py	15 Jun 2003 17:49:59 -0000	1.9
--- OutputWindow.py	9 Jul 2003 18:48:24 -0000	1.10
***************
*** 14,18 ****
  
      def __init__(self, *args):
!         apply(EditorWindow.__init__, (self,) + args)
          self.text.bind("<<goto-file-line>>", self.goto_file_line)
  
--- 14,18 ----
  
      def __init__(self, *args):
!         EditorWindow.__init__(self, *args)
          self.text.bind("<<goto-file-line>>", self.goto_file_line)
  
***************
*** 137,141 ****
          for tag, cnf in self.tagdefs.items():
              if cnf:
!                 apply(text.tag_configure, (tag,), cnf)
          text.tag_raise('sel')
          self.write = self.owin.write
--- 137,141 ----
          for tag, cnf in self.tagdefs.items():
              if cnf:
!                 text.tag_configure(tag, **cnf)
          text.tag_raise('sel')
          self.write = self.owin.write

Index: Percolator.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/Percolator.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Percolator.py	13 Jul 2001 20:00:15 -0000	1.3
--- Percolator.py	9 Jul 2003 18:48:24 -0000	1.4
***************
*** 60,67 ****
          def insert(self, *args):
              print self.name, ": insert", args
!             apply(self.delegate.insert, args)
          def delete(self, *args):
              print self.name, ": delete", args
!             apply(self.delegate.delete, args)
      root = Tk()
      root.wm_protocol("WM_DELETE_WINDOW", root.quit)
--- 60,67 ----
          def insert(self, *args):
              print self.name, ": insert", args
!             self.delegate.insert(*args)
          def delete(self, *args):
              print self.name, ": delete", args
!             self.delegate.delete(*args)
      root = Tk()
      root.wm_protocol("WM_DELETE_WINDOW", root.quit)

Index: PyShell.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/PyShell.py,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** PyShell.py	9 Jul 2003 04:27:24 -0000	1.79
--- PyShell.py	9 Jul 2003 18:48:24 -0000	1.80
***************
*** 78,82 ****
      def __init__(self, *args):
          self.breakpoints = []
!         apply(EditorWindow.__init__, (self,) + args)
          self.text.bind("<<set-breakpoint-here>>", self.set_breakpoint_here)
          self.text.bind("<<clear-breakpoint-here>>", self.clear_breakpoint_here)
--- 78,82 ----
      def __init__(self, *args):
          self.breakpoints = []
!         EditorWindow.__init__(self, *args)
          self.text.bind("<<set-breakpoint-here>>", self.set_breakpoint_here)
          self.text.bind("<<clear-breakpoint-here>>", self.clear_breakpoint_here)

Index: TreeWidget.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/TreeWidget.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TreeWidget.py	22 Jan 2003 00:31:09 -0000	1.6
--- TreeWidget.py	9 Jul 2003 18:48:24 -0000	1.7
***************
*** 415,419 ****
          self.frame.rowconfigure(0, weight=1)
          self.frame.columnconfigure(0, weight=1)
!         self.canvas = apply(Canvas, (self.frame,), opts)
          self.canvas.grid(row=0, column=0, sticky="nsew")
          self.vbar = Scrollbar(self.frame, name="vbar")
--- 415,419 ----
          self.frame.rowconfigure(0, weight=1)
          self.frame.columnconfigure(0, weight=1)
!         self.canvas = Canvas(self.frame, **opts)
          self.canvas.grid(row=0, column=0, sticky="nsew")
          self.vbar = Scrollbar(self.frame, name="vbar")

Index: WidgetRedirector.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/WidgetRedirector.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WidgetRedirector.py	4 Jul 2001 03:15:10 -0000	1.2
--- WidgetRedirector.py	9 Jul 2003 18:48:24 -0000	1.3
***************
*** 52,56 ****
          try:
              if m:
!                 return apply(m, args)
              else:
                  return self.tk.call((self.orig, cmd) + args)
--- 52,56 ----
          try:
              if m:
!                 return m(*args)
              else:
                  return self.tk.call((self.orig, cmd) + args)
***************
*** 85,89 ****
      def my_insert(*args):
          print "insert", args
!         apply(orig_insert, args)
      orig_insert = redir.register("insert", my_insert)
      root.mainloop()
--- 85,89 ----
      def my_insert(*args):
          print "insert", args
!         orig_insert(*args)
      orig_insert = redir.register("insert", my_insert)
      root.mainloop()

Index: configDialog.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/configDialog.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** configDialog.py	26 May 2003 20:35:53 -0000	1.54
--- configDialog.py	9 Jul 2003 18:48:24 -0000	1.55
***************
*** 795,800 ****
          else: plane='background'
          sampleElement=self.themeElements[self.highlightTarget.get()][0]
!         apply(self.textHighlightSample.tag_config,
!                 (sampleElement,),{plane:newColour})
          theme=self.customTheme.get()
          themeElement=sampleElement+'-'+plane
--- 795,799 ----
          else: plane='background'
          sampleElement=self.themeElements[self.highlightTarget.get()][0]
!         self.textHighlightSample.tag_config(sampleElement, **{plane:newColour})
          theme=self.customTheme.get()
          themeElement=sampleElement+'-'+plane
***************
*** 891,895 ****
                  if themeDict.has_key(element+'-background'):
                      colours['background']=themeDict[element+'-background']
!             apply(self.textHighlightSample.tag_config,(element,),colours)
          self.SetColourSample()
  
--- 890,894 ----
                  if themeDict.has_key(element+'-background'):
                      colours['background']=themeDict[element+'-background']
!             self.textHighlightSample.tag_config(element, **colours)
          self.SetColourSample()
  

Index: keybindingDialog.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/keybindingDialog.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** keybindingDialog.py	31 Dec 2002 16:03:23 -0000	1.10
--- keybindingDialog.py	9 Jul 2003 18:48:24 -0000	1.11
***************
*** 189,194 ****
          keys=(self.alphanumKeys+self.punctuationKeys+self.functionKeys+
                  self.whitespaceKeys+self.editKeys+self.moveKeys)
!         apply(self.listKeysFinal.insert,
!             (END,)+keys)
  
      def TranslateKey(self,key):
--- 189,193 ----
          keys=(self.alphanumKeys+self.punctuationKeys+self.functionKeys+
                  self.whitespaceKeys+self.editKeys+self.moveKeys)
!         self.listKeysFinal.insert(END, *keys)
  
      def TranslateKey(self,key):