[Python-checkins] python/dist/src/Lib/lib-tk FileDialog.py, 1.9, 1.10 Tix.py, 1.16, 1.17 Tkinter.py, 1.177, 1.178 turtle.py, 1.11, 1.12

Thu Feb 12 12:35:42 EST 2004

Update of /cvsroot/python/python/dist/src/Lib/lib-tk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21620/Lib/lib-tk

Modified Files:
	FileDialog.py Tix.py Tkinter.py turtle.py 
Log Message:
Replace backticks with repr() or "%r"

>From SF patch #852334.


Index: FileDialog.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/lib-tk/FileDialog.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FileDialog.py	21 Jan 2003 14:19:21 -0000	1.9
--- FileDialog.py	12 Feb 2004 17:35:09 -0000	1.10
***************
*** 245,249 ****
              d = Dialog(self.top,
                         title="Overwrite Existing File Question",
!                        text="Overwrite existing file %s?" % `file`,
                         bitmap='questhead',
                         default=1,
--- 245,249 ----
              d = Dialog(self.top,
                         title="Overwrite Existing File Question",
!                        text="Overwrite existing file %r?" % (file,),
                         bitmap='questhead',
                         default=1,

Index: Tix.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/lib-tk/Tix.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Tix.py	6 Apr 2003 09:00:50 -0000	1.16
--- Tix.py	12 Feb 2004 17:35:09 -0000	1.17
***************
*** 375,381 ****
              return
          elif not isinstance(option, StringType):
!             option = `option`
          if not isinstance(value, StringType):
!             value = `value`
          names = self._subwidget_names()
          for name in names:
--- 375,381 ----
              return
          elif not isinstance(option, StringType):
!             option = repr(option)
          if not isinstance(value, StringType):
!             value = repr(value)
          names = self._subwidget_names()
          for name in names:

Index: Tkinter.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/lib-tk/Tkinter.py,v
retrieving revision 1.177
retrieving revision 1.178
diff -C2 -d -r1.177 -r1.178
*** Tkinter.py	1 Jul 2003 21:12:47 -0000	1.177
--- Tkinter.py	12 Feb 2004 17:35:09 -0000	1.178
***************
*** 178,182 ****
          self._master = master
          self._tk = master.tk
!         self._name = 'PY_VAR' + `_varnum`
          _varnum = _varnum + 1
          self.set(self._default)
--- 178,182 ----
          self._master = master
          self._tk = master.tk
!         self._name = 'PY_VAR' + repr(_varnum)
          _varnum = _varnum + 1
          self.set(self._default)
***************
*** 1023,1027 ****
          be given which will be executed before FUNC."""
          f = CallWrapper(func, subst, self).__call__
!         name = `id(f)`
          try:
              func = func.im_func
--- 1023,1027 ----
          be given which will be executed before FUNC."""
          f = CallWrapper(func, subst, self).__call__
!         name = repr(id(f))
          try:
              func = func.im_func
***************
*** 1811,1815 ****
              del cnf['name']
          if not name:
!             name = `id(self)`
          self._name = name
          if master._w=='.':
--- 1811,1815 ----
              del cnf['name']
          if not name:
!             name = repr(id(self))
          self._name = name
          if master._w=='.':
***************
*** 1958,1964 ****
  def At(x, y=None):
      if y is None:
!         return '@' + `x`
      else:
!         return '@' + `x` + ',' + `y`
  
  class Canvas(Widget):
--- 1958,1964 ----
  def At(x, y=None):
      if y is None:
!         return '@%r' % (x,)
      else:
!         return '@%r,%r' % (x, y)
  
  class Canvas(Widget):
***************
*** 3119,3123 ****
          if not name:
              Image._last_id += 1
!             name = "pyimage" +`Image._last_id` # tk itself would use image<x>
              # The following is needed for systems where id(x)
              # can return a negative number, such as Linux/m68k:
--- 3119,3123 ----
          if not name:
              Image._last_id += 1
!             name = "pyimage%r" % (Image._last_id,) # tk itself would use image<x>
              # The following is needed for systems where id(x)
              # can return a negative number, such as Linux/m68k:

Index: turtle.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/lib-tk/turtle.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** turtle.py	9 Jun 2003 08:50:57 -0000	1.11
--- turtle.py	12 Feb 2004 17:35:10 -0000	1.12
***************
*** 96,100 ****
                      id = self._canvas.create_line(0, 0, 0, 0, fill=color)
                  except Tkinter.TclError:
!                     raise Error, "bad color string: %s" % `color`
                  self._set_color(color)
                  return
--- 96,100 ----
                      id = self._canvas.create_line(0, 0, 0, 0, fill=color)
                  except Tkinter.TclError:
!                     raise Error, "bad color string: %r" % (color,)
                  self._set_color(color)
                  return
***************
*** 102,111 ****
                  r, g, b = color
              except:
!                 raise Error, "bad color sequence: %s" % `color`
          else:
              try:
                  r, g, b = args
              except:
!                 raise Error, "bad color arguments: %s" % `args`
          assert 0 <= r <= 1
          assert 0 <= g <= 1
--- 102,111 ----
                  r, g, b = color
              except:
!                 raise Error, "bad color sequence: %r" % (color,)
          else:
              try:
                  r, g, b = args
              except:
!                 raise Error, "bad color arguments: %r" % (args,)
          assert 0 <= r <= 1
          assert 0 <= g <= 1
***************
*** 241,250 ****
                  x, y = args[0]
              except:
!                 raise Error, "bad point argument: %s" % `args[0]`
          else:
              try:
                  x, y = args
              except:
!                 raise Error, "bad coordinates: %s" % `args[0]`
          x0, y0 = self._origin
          self._goto(x0+x, y0-y)
--- 241,250 ----
                  x, y = args[0]
              except:
!                 raise Error, "bad point argument: %r" % (args[0],)
          else:
              try:
                  x, y = args
              except:
!                 raise Error, "bad coordinates: %r" % (args[0],)
          x0, y0 = self._origin
          self._goto(x0+x, y0-y)