mirror of
https://github.com/python/cpython.git
synced 2025-10-13 18:33:34 +00:00
Issue #6878: Fixed return type of tkinter methods documented to return lists.
This commit is contained in:
parent
7744e2ae5e
commit
022f049fed
3 changed files with 21 additions and 21 deletions
|
@ -216,8 +216,8 @@ class Variable:
|
||||||
self._master.deletecommand(cbname)
|
self._master.deletecommand(cbname)
|
||||||
def trace_vinfo(self):
|
def trace_vinfo(self):
|
||||||
"""Return all trace callback information."""
|
"""Return all trace callback information."""
|
||||||
return map(self._tk.split, self._tk.splitlist(
|
return [self._tk.split(x) for x in self._tk.splitlist(
|
||||||
self._tk.call("trace", "vinfo", self._name)))
|
self._tk.call("trace", "vinfo", self._name))]
|
||||||
def __eq__(self, other):
|
def __eq__(self, other):
|
||||||
"""Comparison for equality (==).
|
"""Comparison for equality (==).
|
||||||
|
|
||||||
|
@ -855,7 +855,7 @@ class Misc:
|
||||||
includeids and 'includeids' or None))
|
includeids and 'includeids' or None))
|
||||||
if isinstance(data, str):
|
if isinstance(data, str):
|
||||||
data = [self.tk.split(data)]
|
data = [self.tk.split(data)]
|
||||||
return map(self.__winfo_parseitem, data)
|
return [self.__winfo_parseitem(x) for x in data]
|
||||||
def __winfo_parseitem(self, t):
|
def __winfo_parseitem(self, t):
|
||||||
"""Internal function."""
|
"""Internal function."""
|
||||||
return t[:1] + tuple(map(self.__winfo_getint, t[1:]))
|
return t[:1] + tuple(map(self.__winfo_getint, t[1:]))
|
||||||
|
@ -1200,8 +1200,8 @@ class Misc:
|
||||||
self.configure({key: value})
|
self.configure({key: value})
|
||||||
def keys(self):
|
def keys(self):
|
||||||
"""Return a list of all resource names of this widget."""
|
"""Return a list of all resource names of this widget."""
|
||||||
return map(lambda x: x[0][1:],
|
return [x[0][1:] for x in
|
||||||
self.tk.split(self.tk.call(self._w, 'configure')))
|
self.tk.split(self.tk.call(self._w, 'configure'))]
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
"""Return the window path name of this widget."""
|
"""Return the window path name of this widget."""
|
||||||
return self._w
|
return self._w
|
||||||
|
@ -1223,18 +1223,18 @@ class Misc:
|
||||||
def pack_slaves(self):
|
def pack_slaves(self):
|
||||||
"""Return a list of all slaves of this widget
|
"""Return a list of all slaves of this widget
|
||||||
in its packing order."""
|
in its packing order."""
|
||||||
return map(self._nametowidget,
|
return [self._nametowidget(x) for x in
|
||||||
self.tk.splitlist(
|
self.tk.splitlist(
|
||||||
self.tk.call('pack', 'slaves', self._w)))
|
self.tk.call('pack', 'slaves', self._w))]
|
||||||
slaves = pack_slaves
|
slaves = pack_slaves
|
||||||
# Place method that applies to the master
|
# Place method that applies to the master
|
||||||
def place_slaves(self):
|
def place_slaves(self):
|
||||||
"""Return a list of all slaves of this widget
|
"""Return a list of all slaves of this widget
|
||||||
in its packing order."""
|
in its packing order."""
|
||||||
return map(self._nametowidget,
|
return [self._nametowidget(x) for x in
|
||||||
self.tk.splitlist(
|
self.tk.splitlist(
|
||||||
self.tk.call(
|
self.tk.call(
|
||||||
'place', 'slaves', self._w)))
|
'place', 'slaves', self._w))]
|
||||||
# Grid methods that apply to the master
|
# Grid methods that apply to the master
|
||||||
def grid_bbox(self, column=None, row=None, col2=None, row2=None):
|
def grid_bbox(self, column=None, row=None, col2=None, row2=None):
|
||||||
"""Return a tuple of integer coordinates for the bounding
|
"""Return a tuple of integer coordinates for the bounding
|
||||||
|
@ -1338,9 +1338,9 @@ class Misc:
|
||||||
args = args + ('-row', row)
|
args = args + ('-row', row)
|
||||||
if column is not None:
|
if column is not None:
|
||||||
args = args + ('-column', column)
|
args = args + ('-column', column)
|
||||||
return map(self._nametowidget,
|
return [self._nametowidget(x) for x in
|
||||||
self.tk.splitlist(self.tk.call(
|
self.tk.splitlist(self.tk.call(
|
||||||
('grid', 'slaves', self._w) + args)))
|
('grid', 'slaves', self._w) + args))]
|
||||||
|
|
||||||
# Support for the "event" command, new in Tk 4.2.
|
# Support for the "event" command, new in Tk 4.2.
|
||||||
# By Case Roole.
|
# By Case Roole.
|
||||||
|
@ -1494,7 +1494,7 @@ class Wm:
|
||||||
if len(wlist) > 1:
|
if len(wlist) > 1:
|
||||||
wlist = (wlist,) # Tk needs a list of windows here
|
wlist = (wlist,) # Tk needs a list of windows here
|
||||||
args = ('wm', 'colormapwindows', self._w) + wlist
|
args = ('wm', 'colormapwindows', self._w) + wlist
|
||||||
return map(self._nametowidget, self.tk.call(args))
|
return [self._nametowidget(x) for x in self.tk.call(args)]
|
||||||
colormapwindows = wm_colormapwindows
|
colormapwindows = wm_colormapwindows
|
||||||
def wm_command(self, value=None):
|
def wm_command(self, value=None):
|
||||||
"""Store VALUE in WM_COMMAND property. It is the command
|
"""Store VALUE in WM_COMMAND property. It is the command
|
||||||
|
@ -2157,9 +2157,9 @@ class Canvas(Widget, XView, YView):
|
||||||
def coords(self, *args):
|
def coords(self, *args):
|
||||||
"""Return a list of coordinates for the item given in ARGS."""
|
"""Return a list of coordinates for the item given in ARGS."""
|
||||||
# XXX Should use _flatten on args
|
# XXX Should use _flatten on args
|
||||||
return map(getdouble,
|
return [getdouble(x) for x in
|
||||||
self.tk.splitlist(
|
self.tk.splitlist(
|
||||||
self.tk.call((self._w, 'coords') + args)))
|
self.tk.call((self._w, 'coords') + args))]
|
||||||
def _create(self, itemType, args, kw): # Args: (val, val, ..., cnf={})
|
def _create(self, itemType, args, kw): # Args: (val, val, ..., cnf={})
|
||||||
"""Internal function."""
|
"""Internal function."""
|
||||||
args = _flatten(args)
|
args = _flatten(args)
|
||||||
|
|
|
@ -268,10 +268,10 @@ class Form:
|
||||||
return self.tk.call('tixForm', 'info', self._w, option)
|
return self.tk.call('tixForm', 'info', self._w, option)
|
||||||
|
|
||||||
def slaves(self):
|
def slaves(self):
|
||||||
return map(self._nametowidget,
|
return [self._nametowidget(x) for x in
|
||||||
self.tk.splitlist(
|
self.tk.splitlist(
|
||||||
self.tk.call(
|
self.tk.call(
|
||||||
'tixForm', 'slaves', self._w)))
|
'tixForm', 'slaves', self._w))]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -752,7 +752,7 @@ class TurtleScreenBase(object):
|
||||||
[(0.0, 9.9999999999999982), (0.0, -9.9999999999999982),
|
[(0.0, 9.9999999999999982), (0.0, -9.9999999999999982),
|
||||||
(9.9999999999999982, 0.0)]
|
(9.9999999999999982, 0.0)]
|
||||||
>>> """
|
>>> """
|
||||||
cl = list(self.cv.coords(item))
|
cl = self.cv.coords(item)
|
||||||
pl = [(cl[i], -cl[i+1]) for i in range(0, len(cl), 2)]
|
pl = [(cl[i], -cl[i+1]) for i in range(0, len(cl), 2)]
|
||||||
return pl
|
return pl
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue