SF patch #701494: more apply removals
diff --git a/Lib/lib-tk/Canvas.py b/Lib/lib-tk/Canvas.py
index ae2ced1..83d7bba 100644
--- a/Lib/lib-tk/Canvas.py
+++ b/Lib/lib-tk/Canvas.py
@@ -55,7 +55,7 @@
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 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):