mirror of
https://github.com/python/cpython.git
synced 2025-09-19 23:20:25 +00:00
For StringVar results to strings. Document that boolean things are of
type bool. Requested in #721171.
This commit is contained in:
parent
76ba09fd81
commit
bfe175c190
2 changed files with 10 additions and 4 deletions
|
@ -223,7 +223,10 @@ class StringVar(Variable):
|
||||||
|
|
||||||
def get(self):
|
def get(self):
|
||||||
"""Return value of variable as string."""
|
"""Return value of variable as string."""
|
||||||
return self._tk.globalgetvar(self._name)
|
value = self._tk.globalgetvar(self._name)
|
||||||
|
if isinstance(value, basestring):
|
||||||
|
return value
|
||||||
|
return str(value)
|
||||||
|
|
||||||
class IntVar(Variable):
|
class IntVar(Variable):
|
||||||
"""Value holder for integer variables."""
|
"""Value holder for integer variables."""
|
||||||
|
@ -267,7 +270,7 @@ class BooleanVar(Variable):
|
||||||
Variable.__init__(self, master)
|
Variable.__init__(self, master)
|
||||||
|
|
||||||
def get(self):
|
def get(self):
|
||||||
"""Return the value of the variable as 0 or 1."""
|
"""Return the value of the variable as a bool."""
|
||||||
return self._tk.getboolean(self._tk.globalgetvar(self._name))
|
return self._tk.getboolean(self._tk.globalgetvar(self._name))
|
||||||
|
|
||||||
def mainloop(n=0):
|
def mainloop(n=0):
|
||||||
|
@ -369,7 +372,7 @@ class Misc:
|
||||||
getint = int
|
getint = int
|
||||||
getdouble = float
|
getdouble = float
|
||||||
def getboolean(self, s):
|
def getboolean(self, s):
|
||||||
"""Return 0 or 1 for Tcl boolean values true and false given as parameter."""
|
"""Return a boolean value for Tcl boolean values true and false given as parameter."""
|
||||||
return self.tk.getboolean(s)
|
return self.tk.getboolean(s)
|
||||||
def focus_set(self):
|
def focus_set(self):
|
||||||
"""Direct input focus to this widget.
|
"""Direct input focus to this widget.
|
||||||
|
@ -1636,7 +1639,7 @@ class Pack:
|
||||||
anchor=NSEW (or subset) - position widget according to
|
anchor=NSEW (or subset) - position widget according to
|
||||||
given direction
|
given direction
|
||||||
before=widget - pack it before you will pack widget
|
before=widget - pack it before you will pack widget
|
||||||
expand=1 or 0 - expand widget if parent size grows
|
expand=bool - expand widget if parent size grows
|
||||||
fill=NONE or X or Y or BOTH - fill widget if widget grows
|
fill=NONE or X or Y or BOTH - fill widget if widget grows
|
||||||
in=master - use master to contain this widget
|
in=master - use master to contain this widget
|
||||||
ipadx=amount - add internal padding in x direction
|
ipadx=amount - add internal padding in x direction
|
||||||
|
|
|
@ -63,6 +63,9 @@ Core and builtins
|
||||||
Extension modules
|
Extension modules
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
|
- Tkinter wrappers around Tcl variables now pass objects directly
|
||||||
|
to Tcl, instead of first converting them to strings.
|
||||||
|
|
||||||
- The .*? pattern in the re module is now special-cased to avoid the
|
- The .*? pattern in the re module is now special-cased to avoid the
|
||||||
recursion limit. (SF patch #720991 -- many thanks to Gary Herron
|
recursion limit. (SF patch #720991 -- many thanks to Gary Herron
|
||||||
and Greg Chapman.)
|
and Greg Chapman.)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue