SF patch #701494: more apply removals

Lib/compiler/transformer.py

@@ -72,7 +72,7 @@ def Node(*args):
     kind = args[0]
     if nodes.has_key(kind):
         try:
-            return apply(nodes[kind], args[1:])
+            return nodes[kind](*args[1:])
         except TypeError:
             print nodes[kind], len(args), args
             raise

Lib/curses/wrapper.py

@@ -41,7 +41,7 @@ def wrapper(func, *rest):
         except:
             pass
 
-        res = apply(func, (stdscr,) + rest)
+        res = func(stdscr, *rest)
     except:
         # In the event of an error, restore the terminal
         # to a sane state.

Lib/lib-tk/Canvas.py

@@ -55,7 +55,7 @@ class CanvasItem:
     def coords(self, pts = ()):
         flat = ()
         for x, y in pts: flat = flat + (x, y)
-        return apply(self.canvas.coords, (self.id,) + flat)
+        return self.canvas.coords(self.id, *flat)
     def dchars(self, first, last=None):
         self.canvas.dchars(self.id, first, last)
     def dtag(self, ttd):
@@ -84,40 +84,40 @@ class CanvasItem:
 
 class Arc(CanvasItem):
     def __init__(self, canvas, *args, **kw):
-        apply(CanvasItem.__init__, (self, canvas, 'arc') + args, kw)
+        CanvasItem.__init__(self, canvas, 'arc', *args, **kw)
 
 class Bitmap(CanvasItem):
     def __init__(self, canvas, *args, **kw):
-        apply(CanvasItem.__init__, (self, canvas, 'bitmap') + args, kw)
+        CanvasItem.__init__(self, canvas, 'bitmap', *args, **kw)
 
 class ImageItem(CanvasItem):
     def __init__(self, canvas, *args, **kw):
-        apply(CanvasItem.__init__, (self, canvas, 'image') + args, kw)
+        CanvasItem.__init__(self, canvas, 'image', *args, **kw)
 
 class Line(CanvasItem):
     def __init__(self, canvas, *args, **kw):
-        apply(CanvasItem.__init__, (self, canvas, 'line') + args, kw)
+        CanvasItem.__init__(self, canvas, 'line', *args, **kw)
 
 class Oval(CanvasItem):
     def __init__(self, canvas, *args, **kw):
-        apply(CanvasItem.__init__, (self, canvas, 'oval') + args, kw)
+        CanvasItem.__init__(self, canvas, 'oval', *args, **kw)
 
 class Polygon(CanvasItem):
     def __init__(self, canvas, *args, **kw):
-        apply(CanvasItem.__init__, (self, canvas, 'polygon') + args,kw)
+        CanvasItem.__init__(self, canvas, 'polygon', *args, **kw)
 
 class Rectangle(CanvasItem):
     def __init__(self, canvas, *args, **kw):
-        apply(CanvasItem.__init__, (self, canvas, 'rectangle')+args,kw)
+        CanvasItem.__init__(self, canvas, 'rectangle', *args, **kw)
 
 # XXX "Text" is taken by the Text widget...
 class CanvasText(CanvasItem):
     def __init__(self, canvas, *args, **kw):
-        apply(CanvasItem.__init__, (self, canvas, 'text') + args, kw)
+        CanvasItem.__init__(self, canvas, 'text', *args, **kw)
 
 class Window(CanvasItem):
     def __init__(self, canvas, *args, **kw):
-        apply(CanvasItem.__init__, (self, canvas, 'window') + args, kw)
+        CanvasItem.__init__(self, canvas, 'window', *args, **kw)
 
 class Group:
     def __init__(self, canvas, tag=None):

Lib/lib-tk/Dialog.py

@@ -15,11 +15,11 @@ class Dialog(Widget):
         self.widgetName = '__dialog__'
         Widget._setup(self, master, cnf)
         self.num = self.tk.getint(
-                apply(self.tk.call,
-                      ('tk_dialog', self._w,
+                self.tk.call(
+                      'tk_dialog', self._w,
                       cnf['title'], cnf['text'],
-                       cnf['bitmap'], cnf['default'])
-                      + cnf['strings']))
+                      cnf['bitmap'], cnf['default'],
+                      *cnf['strings']))
         try: Widget.destroy(self)
         except TclError: pass
     def destroy(self): pass

Lib/lib-tk/ScrolledText.py

@@ -24,11 +24,11 @@ class ScrolledText(Text):
             if type(k) == ClassType or k == 'name':
                 fcnf[k] = cnf[k]
                 del cnf[k]
-        self.frame = apply(Frame, (master,), fcnf)
+        self.frame = Frame(master, **fcnf)
         self.vbar = Scrollbar(self.frame, name='vbar')
         self.vbar.pack(side=RIGHT, fill=Y)
         cnf['name'] = 'text'
-        apply(Text.__init__, (self, self.frame), cnf)
+        Text.__init__(self, self.frame, **cnf)
         self.pack(side=LEFT, fill=BOTH, expand=1)
         self['yscrollcommand'] = self.vbar.set
         self.vbar['command'] = self.yview

Lib/lib-tk/Tkinter.py

@@ -444,7 +444,7 @@ class Misc:
             tmp = []
             def callit(func=func, args=args, self=self, tmp=tmp):
                 try:
-                    apply(func, args)
+                    func(*args)
                 finally:
                     try:
                         self.deletecommand(tmp[0])
@@ -459,7 +459,7 @@ class Misc:
 
         Return an identifier to cancel the scheduling with
         after_cancel."""
-        return apply(self.after, ('idle', func) + args)
+        return self.after('idle', func, *args)
     def after_cancel(self, id):
         """Cancel scheduling of function identified with ID.
 
@@ -1182,7 +1182,7 @@ class Misc:
             args = args + (column, row)
         if col2 is not None and row2 is not None:
             args = args + (col2, row2)
-        return self._getints(apply(self.tk.call, args)) or None
+        return self._getints(self.tk.call(*args)) or None
 
     bbox = grid_bbox
     def _grid_configure(self, command, index, cnf, kw):
@@ -1324,8 +1324,8 @@ class CallWrapper:
         """Apply first function SUBST to arguments, than FUNC."""
         try:
             if self.subst:
-                args = apply(self.subst, args)
-            return apply(self.func, args)
+                args = self.subst(*args)
+            return self.func(*args)
         except SystemExit, msg:
             raise SystemExit, msg
         except:
@@ -2028,10 +2028,9 @@ class Canvas(Widget):
             args = args[:-1]
         else:
             cnf = {}
-        return getint(apply(
-            self.tk.call,
-            (self._w, 'create', itemType)
-            + args + self._options(cnf, kw)))
+        return getint(self.tk.call(
+            self._w, 'create', itemType,
+            *(args + self._options(cnf, kw))))
     def create_arc(self, *args, **kw):
         """Create arc shaped region with coordinates x1,y1,x2,y2."""
         return self._create('arc', args, kw)
@@ -2862,9 +2861,9 @@ class Text(Widget):
         return self._configure(('image', 'configure', index), cnf, kw)
     def image_create(self, index, cnf={}, **kw):
         """Create an embedded image at INDEX."""
-        return apply(self.tk.call,
-                 (self._w, "image", "create", index)
-                 + self._options(cnf, kw))
+        return self.tk.call(
+                 self._w, "image", "create", index,
+                 *self._options(cnf, kw))
     def image_names(self):
         """Return all names of embedded images in this widget."""
         return self.tk.call(self._w, "image", "names")
@@ -3050,7 +3049,7 @@ class _setit:
     def __call__(self, *args):
         self.__var.set(self.__value)
         if self.__callback:
-            apply(self.__callback, (self.__value,)+args)
+            self.__callback(self.__value, *args)
 
 class OptionMenu(Menubutton):
     """OptionMenu which allows the user to select a value from a menu."""
@@ -3156,7 +3155,7 @@ class PhotoImage(Image):
 
         Valid resource names: data, format, file, gamma, height, palette,
         width."""
-        apply(Image.__init__, (self, 'photo', name, cnf, master), kw)
+        Image.__init__(self, 'photo', name, cnf, master, **kw)
     def blank(self):
         """Display a transparent image."""
         self.tk.call(self.name, 'blank')
@@ -3215,7 +3214,7 @@ class BitmapImage(Image):
         """Create a bitmap with NAME.
 
         Valid resource names: background, data, file, foreground, maskdata, maskfile."""
-        apply(Image.__init__, (self, 'bitmap', name, cnf, master), kw)
+        Image.__init__(self, 'bitmap', name, cnf, master, **kw)
 
 def image_names(): return _default_root.tk.call('image', 'names')
 def image_types(): return _default_root.tk.call('image', 'types')

Lib/lib-tk/tkColorChooser.py

@@ -63,7 +63,7 @@ def askcolor(color = None, **options):
         options = options.copy()
         options["initialcolor"] = color
 
-    return apply(Chooser, (), options).show()
+    return Chooser(**options).show()
 
 
 # --------------------------------------------------------------------

Lib/lib-tk/tkCommonDialog.py

@@ -49,7 +49,7 @@ class Dialog:
 
         try:
 
-            s = apply(w.tk.call, (self.command,) + w._options(self.options))
+            s = w.tk.call(self.command, *w._options(self.options))
 
             s = self._fixresult(w, s)
 

Lib/lib-tk/tkFont.py

@@ -73,7 +73,7 @@ class Font:
         if not name:
             name = "font" + str(id(self))
         self.name = name
-        apply(root.tk.call, ("font", "create", name) + font)
+        root.tk.call("font", "create", name, *font)
         # backlinks!
         self._root  = root
         self._split = root.tk.splitlist
@@ -90,7 +90,7 @@ class Font:
 
     def copy(self):
         "Return a distinct copy of the current font"
-        return apply(Font, (self._root,), self.actual())
+        return Font(self._root, **self.actual())
 
     def actual(self, option=None):
         "Return actual font attributes"
@@ -108,8 +108,8 @@ class Font:
     def config(self, **options):
         "Modify font attributes"
         if options:
-            apply(self._call, ("font", "config", self.name) +
-                  self._set(options))
+            self._call("font", "config", self.name,
+                  *self._set(options))
         else:
             return self._mkdict(
                 self._split(self._call("font", "config", self.name))

Lib/lib-tk/tkMessageBox.py

@@ -72,37 +72,37 @@ def _show(title=None, message=None, icon=None, type=None, **options):
     if type:    options["type"] = type
     if title:   options["title"] = title
     if message: options["message"] = message
-    return apply(Message, (), options).show()
+    return Message(**options).show()
 
 def showinfo(title=None, message=None, **options):
     "Show an info message"
-    return apply(_show, (title, message, INFO, OK), options)
+    return _show(title, message, INFO, OK, **options)
 
 def showwarning(title=None, message=None, **options):
     "Show a warning message"
-    return apply(_show, (title, message, WARNING, OK), options)
+    return _show(title, message, WARNING, OK, **options)
 
 def showerror(title=None, message=None, **options):
     "Show an error message"
-    return apply(_show, (title, message, ERROR, OK), options)
+    return _show(title, message, ERROR, OK, **options)
 
 def askquestion(title=None, message=None, **options):
     "Ask a question"
-    return apply(_show, (title, message, QUESTION, YESNO), options)
+    return _show(title, message, QUESTION, YESNO, **options)
 
 def askokcancel(title=None, message=None, **options):
     "Ask if operation should proceed; return true if the answer is ok"
-    s = apply(_show, (title, message, QUESTION, OKCANCEL), options)
+    s = _show(title, message, QUESTION, OKCANCEL, **options)
     return s == OK
 
 def askyesno(title=None, message=None, **options):
     "Ask a question; return true if the answer is yes"
-    s = apply(_show, (title, message, QUESTION, YESNO), options)
+    s = _show(title, message, QUESTION, YESNO, **options)
     return s == YES
 
 def askretrycancel(title=None, message=None, **options):
     "Ask if operation should be retried; return true if the answer is yes"
-    s = apply(_show, (title, message, WARNING, RETRYCANCEL), options)
+    s = _show(title, message, WARNING, RETRYCANCEL, **options)
     return s == RETRY
 
 

Lib/lib-tk/tkSimpleDialog.py

@@ -249,7 +249,7 @@ def askinteger(title, prompt, **kw):
 
     Return value is an integer
     '''
-    d = apply(_QueryInteger, (title, prompt), kw)
+    d = _QueryInteger(title, prompt, **kw)
     return d.result
 
 class _QueryFloat(_QueryDialog):
@@ -268,7 +268,7 @@ def askfloat(title, prompt, **kw):
 
     Return value is a float
     '''
-    d = apply(_QueryFloat, (title, prompt), kw)
+    d = _QueryFloat(title, prompt, **kw)
     return d.result
 
 class _QueryString(_QueryDialog):
@@ -300,7 +300,7 @@ def askstring(title, prompt, **kw):
 
     Return value is a string
     '''
-    d = apply(_QueryString, (title, prompt), kw)
+    d = _QueryString(title, prompt, **kw)
     return d.result
 
 if __name__ == "__main__":

Lib/lib-tk/turtle.py

@@ -354,11 +354,11 @@ def right(angle): _getpen().right(angle)
 def up(): _getpen().up()
 def down(): _getpen().down()
 def width(width): _getpen().width(width)
-def color(*args): apply(_getpen().color, args)
+def color(*args): _getpen().color(*args)
 def write(arg, move=0): _getpen().write(arg, move)
 def fill(flag): _getpen().fill(flag)
 def circle(radius, extent=None): _getpen().circle(radius, extent)
-def goto(*args): apply(_getpen().goto, args)
+def goto(*args): _getpen().goto(*args)
 def heading(): return _getpen().heading()
 def setheading(angle): _getpen().setheading(angle)
 def position(): return _getpen().position()

Lib/plat-mac/Carbon/MediaDescr.py

@@ -37,7 +37,7 @@ class _MediaDescriptionCodec:
                         if cod:
                                 value = cod(value)
                         list.append(value)
-		rv = apply(struct.pack, tuple(list))
+                rv = struct.pack(*list)
                 return rv
 
 # Helper functions

Lib/plat-mac/EasyDialogs.py

@@ -566,7 +566,7 @@ def GetArgv(optionlist=None, commandlist=None, addoldfile=1, addnewfile=1, addfo
                 return newlist
         finally:
                 if hasattr(MacOS, 'SchedParams'):
-			apply(MacOS.SchedParams, appsw)
+                        MacOS.SchedParams(*appsw)
                 del d
 
 def _process_Nav_args(dftflags, **args):
@@ -829,7 +829,7 @@ def test():
         finally:
                 del bar
                 if hasattr(MacOS, 'SchedParams'):
-			apply(MacOS.SchedParams, appsw)
+                        MacOS.SchedParams(*appsw)
 
 if __name__ == '__main__':
         try:

Lib/plat-mac/FrameWork.py

@@ -166,7 +166,7 @@ class Application:
         def mainloop(self, mask = everyEvent, wait = None):
                 self.quitting = 0
                 if hasattr(MacOS, 'SchedParams'):
-			saveparams = apply(MacOS.SchedParams, self.schedparams)
+                        saveparams = MacOS.SchedParams(*self.schedparams)
                 try:
                         while not self.quitting:
                                 try:
@@ -178,7 +178,7 @@ class Application:
                                         break
                 finally:
                         if hasattr(MacOS, 'SchedParams'):
-				apply(MacOS.SchedParams, saveparams)
+                                MacOS.SchedParams(*saveparams)
 
         def dopendingevents(self, mask = everyEvent):
                 """dopendingevents - Handle all pending events"""
@@ -233,7 +233,7 @@ class Application:
                 old = self._doing_asyncevents
                 if old:
                         MacOS.SetEventHandler()
-			apply(MacOS.SchedParams, self.schedparams)
+                        MacOS.SchedParams(*self.schedparams)
                 if onoff:
                         MacOS.SetEventHandler(self.dispatch)
                         doint, dummymask, benice, howoften, bgyield = \

Lib/plat-mac/MiniAEFrame.py

@@ -155,10 +155,10 @@ class AEServer:
                         # The try/except that used to be here can mask programmer errors.
                         # Let the program crash, the programmer can always add a **args
                         # to the formal parameter list.
-			rv = apply(_function, (_object,), _parameters)
+                        rv = _function(_object, **_parameters)
                 else:
                         #Same try/except comment as above
-			rv = apply(_function, (), _parameters)
+                        rv = _function(**_parameters)
 
                 if rv == None:
                         aetools.packevent(_reply, {})

Lib/plat-mac/argvemulator.py

@@ -86,10 +86,10 @@ class ArgvCollector:
                         # The try/except that used to be here can mask programmer errors.
                         # Let the program crash, the programmer can always add a **args
                         # to the formal parameter list.
-			rv = apply(_function, (_object,), _parameters)
+                        rv = _function(_object, **_parameters)
                 else:
                         #Same try/except comment as above
-			rv = apply(_function, (), _parameters)
+                        rv = _function(**_parameters)
 
                 if rv == None:
                         aetools.packevent(_reply, {})

Lib/plat-mac/icopen.py

@@ -42,7 +42,7 @@ import __builtin__
 _builtin_open = globals().get('_builtin_open', __builtin__.open)
 
 def _open_with_typer(*args):
-	file = apply(_builtin_open, args)
+        file = _builtin_open(*args)
         filename = args[0]
         mode = 'r'
         if args[1:]:

Lib/test/reperf.py

@@ -12,7 +12,7 @@ def timefunc(n, func, *args, **kw):
     t0 = time.clock()
     try:
         for i in range(n):
-            result = apply(func, args, kw)
+            result = func(*args, **kw)
         return result
     finally:
         t1 = time.clock()

Lib/test/test_curses.py

@@ -26,7 +26,7 @@ def window_funcs(stdscr):
     for meth in [stdscr.addch, stdscr.addstr]:
         for args in [('a'), ('a', curses.A_BOLD),
                      (4,4, 'a'), (5,5, 'a', curses.A_BOLD)]:
-            apply(meth, args)
+            meth(*args)
 
     for meth in [stdscr.box, stdscr.clear, stdscr.clrtobot,
                  stdscr.clrtoeol, stdscr.cursyncup, stdscr.delch,

Lib/xml/dom/minidom.py

@@ -1902,7 +1902,7 @@ def _get_StringIO():
     return StringIO()
 
 def _do_pulldom_parse(func, args, kwargs):
-    events = apply(func, args, kwargs)
+    events = func(*args, **kwargs)
     toktype, rootNode = events.getEvent()
     events.expandNode(rootNode)
     events.clear()

Python/bltinmodule.c

@@ -112,7 +112,10 @@ PyDoc_STRVAR(apply_doc,
 \n\
 Call a callable object with positional arguments taken from the tuple args,\n\
 and keyword arguments taken from the optional dictionary kwargs.\n\
-Note that classes are callable, as are instances with a __call__() method.");
+Note that classes are callable, as are instances with a __call__() method.\n\
+\n\
+Deprecated since release 2.3. Instead, use the extended call syntax:\n\
+    function(*args, **keywords).");
 
 
 static PyObject *