[Python-checkins] python/dist/src/Lib/lib-tk Tkinter.py,1.171,1.172

loewis@users.sourceforge.net loewis@users.sourceforge.net
Wed, 16 Apr 2003 12:42:55 -0700


Update of /cvsroot/python/python/dist/src/Lib/lib-tk
In directory sc8-pr-cvs1:/tmp/cvs-serv28172/Lib/lib-tk

Modified Files:
	Tkinter.py 
Log Message:
For StringVar results to strings. Document that boolean things are of
type bool. Requested in #721171.


Index: Tkinter.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/lib-tk/Tkinter.py,v
retrieving revision 1.171
retrieving revision 1.172
diff -C2 -d -r1.171 -r1.172
*** Tkinter.py	6 Apr 2003 09:00:51 -0000	1.171
--- Tkinter.py	16 Apr 2003 19:42:51 -0000	1.172
***************
*** 224,228 ****
      def get(self):
          """Return value of variable as string."""
!         return self._tk.globalgetvar(self._name)
  
  class IntVar(Variable):
--- 224,231 ----
      def get(self):
          """Return value of variable as string."""
!         value = self._tk.globalgetvar(self._name)
!         if isinstance(value, basestring):
!             return value
!         return str(value)
  
  class IntVar(Variable):
***************
*** 268,272 ****
  
      def get(self):
!         """Return the value of the variable as 0 or 1."""
          return self._tk.getboolean(self._tk.globalgetvar(self._name))
  
--- 271,275 ----
  
      def get(self):
!         """Return the value of the variable as a bool."""
          return self._tk.getboolean(self._tk.globalgetvar(self._name))
  
***************
*** 370,374 ****
      getdouble = float
      def getboolean(self, s):
!         """Return 0 or 1 for Tcl boolean values true and false given as parameter."""
          return self.tk.getboolean(s)
      def focus_set(self):
--- 373,377 ----
      getdouble = float
      def getboolean(self, s):
!         """Return a boolean value  for Tcl boolean values true and false given as parameter."""
          return self.tk.getboolean(s)
      def focus_set(self):
***************
*** 1637,1641 ****
                                    given direction
                  before=widget - pack it before you will pack widget
!         expand=1 or 0 - expand widget if parent size grows
          fill=NONE or X or Y or BOTH - fill widget if widget grows
          in=master - use master to contain this widget
--- 1640,1644 ----
                                    given direction
                  before=widget - pack it before you will pack widget
!         expand=bool - expand widget if parent size grows
          fill=NONE or X or Y or BOTH - fill widget if widget grows
          in=master - use master to contain this widget