[Python-checkins] CVS: python/dist/src/Lib/lib-tk Tkinter.py,1.143,1.144
Fredrik Lundh
python-dev@python.org
Wed, 9 Aug 2000 11:51:04 -0700
Update of /cvsroot/python/python/dist/src/Lib/lib-tk
In directory slayer.i.sourceforge.net:/tmp/cvs-serv25615/Lib/lib-tk
Modified Files:
Tkinter.py
Log Message:
-- use explicit conversion instead of u-string literal in the test
code, to make the new Tkinter.py run under 1.5.2
-- changed Text.yview argument name (for consistency with xview)
Index: Tkinter.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/lib-tk/Tkinter.py,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -r1.143 -r1.144
*** Tkinter.py 2000/08/09 18:29:51 1.143
--- Tkinter.py 2000/08/09 18:51:01 1.144
***************
*** 2839,2847 ****
in "units" or "pages" (WHAT)."""
self.tk.call(self._w, 'xview', 'scroll', number, what)
! def yview(self, *args):
"""Query and change vertical position of the view."""
! if not args:
return self._getdoubles(self.tk.call(self._w, 'yview'))
! self.tk.call((self._w, 'yview') + args)
def yview_moveto(self, fraction):
"""Adjusts the view in the window so that FRACTION of the
--- 2839,2847 ----
in "units" or "pages" (WHAT)."""
self.tk.call(self._w, 'xview', 'scroll', number, what)
! def yview(self, *what):
"""Query and change vertical position of the view."""
! if not what:
return self._getdoubles(self.tk.call(self._w, 'yview'))
! self.tk.call((self._w, 'yview') + what)
def yview_moveto(self, fraction):
"""Adjusts the view in the window so that FRACTION of the
***************
*** 3061,3065 ****
text = "This is Tcl/Tk version %s" % TclVersion
if TclVersion >= 8.1:
! text = text + u"\nThis should be a cedilla: \347"
label = Label(root, text=text)
label.pack()
--- 3061,3069 ----
text = "This is Tcl/Tk version %s" % TclVersion
if TclVersion >= 8.1:
! try:
! text = text + unicode("\nThis should be a cedilla: \347",
! "iso-8859-1")
! except NameError:
! pass # no unicode support
label = Label(root, text=text)
label.pack()