[Python-checkins] python/dist/src/Demo/classes Complex.py, 1.6, 1.7 Dates.py, 1.4, 1.5 Dbm.py, 1.4, 1.5 Range.py, 1.5, 1.6 bitvec.py, 1.4, 1.5

Thu Feb 12 12:35:35 EST 2004

Update of /cvsroot/python/python/dist/src/Demo/classes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21620/Demo/classes
Modified Files:
	Complex.py Dates.py Dbm.py Range.py bitvec.py 
Log Message:
Replace backticks with repr() or "%r"
>From SF patch #852334.

Index: Complex.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Demo/classes/Complex.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Complex.py	24 Apr 2003 17:08:22 -0000	1.6
--- Complex.py	12 Feb 2004 17:35:01 -0000	1.7
***************
*** 118,130 ****
 def __repr__(self):
 if not self.im:
! return 'Complex(%s)' % `self.re`
 else:
! return 'Complex(%s, %s)' % (`self.re`, `self.im`)

 def __str__(self):
 if not self.im:
! return `self.re`
 else:
! return 'Complex(%s, %s)' % (`self.re`, `self.im`)

 def __neg__(self):
--- 118,130 ----
 def __repr__(self):
 if not self.im:
! return 'Complex(%r)' % (self.re,)
 else:
! return 'Complex(%r, %r)' % (self.re, self.im)

 def __str__(self):
 if not self.im:
! return repr(self.re)
 else:
! return 'Complex(%r, %r)' % (self.re, self.im)

 def __neg__(self):
Index: Dates.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Demo/classes/Dates.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Dates.py	7 Jun 2003 19:39:56 -0000	1.4
--- Dates.py	12 Feb 2004 17:35:01 -0000	1.5
***************
*** 87,91 ****
 def _num2date( n ): # return date with ordinal n
 if type(n) not in _INT_TYPES:
! raise TypeError, 'argument must be integer: ' + `type(n)`

 ans = Date(1,1,1) # arguments irrelevant; just getting a Date obj
--- 87,91 ----
 def _num2date( n ): # return date with ordinal n
 if type(n) not in _INT_TYPES:
! raise TypeError, 'argument must be integer: %r' % type(n)

 ans = Date(1,1,1) # arguments irrelevant; just getting a Date obj
***************
*** 121,128 ****
 def __init__( self, month, day, year ):
 if not 1 <= month <= 12:
! raise ValueError, 'month must be in 1..12: ' + `month`
 dim = _days_in_month( month, year )
 if not 1 <= day <= dim:
! raise ValueError, 'day must be in 1..' + `dim` + ': ' + `day`
 self.month, self.day, self.year = month, day, year
 self.ord = _date2num( self )
--- 121,128 ----
 def __init__( self, month, day, year ):
 if not 1 <= month <= 12:
! raise ValueError, 'month must be in 1..12: %r' % (month,)
 dim = _days_in_month( month, year )
 if not 1 <= day <= dim:
! raise ValueError, 'day must be in 1..%r: %r' % (dim, day)
 self.month, self.day, self.year = month, day, year
 self.ord = _date2num( self )
***************
*** 143,155 ****
 # print as, e.g., Mon 16 Aug 1993
 def __repr__( self ):
! return '%.3s %2d %.3s ' % (
 self.weekday(),
 self.day,
! _MONTH_NAMES[self.month-1] ) + `self.year`

 # Python 1.1 coerces neither int+date nor date+int
 def __add__( self, n ):
 if type(n) not in _INT_TYPES:
! raise TypeError, 'can\'t add ' + `type(n)` + ' to date'
 return _num2date( self.ord + n )
 __radd__ = __add__ # handle int+date
--- 143,156 ----
 # print as, e.g., Mon 16 Aug 1993
 def __repr__( self ):
! return '%.3s %2d %.3s %r' % (
 self.weekday(),
 self.day,
! _MONTH_NAMES[self.month-1],
! self.year)

 # Python 1.1 coerces neither int+date nor date+int
 def __add__( self, n ):
 if type(n) not in _INT_TYPES:
! raise TypeError, 'can\'t add %r to date' % type(n)
 return _num2date( self.ord + n )
 __radd__ = __add__ # handle int+date
***************
*** 178,182 ****
 a = Date(9,30,1913)
 b = Date(9,30,1914)
! if `a` != 'Tue 30 Sep 1913':
 raise DateTestError, '__repr__ failure'
 if (not a < b) or a == b or a > b or b != b:
--- 179,183 ----
 a = Date(9,30,1913)
 b = Date(9,30,1914)
! if repr(a) != 'Tue 30 Sep 1913':
 raise DateTestError, '__repr__ failure'
 if (not a < b) or a == b or a > b or b != b:
Index: Dbm.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Demo/classes/Dbm.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Dbm.py	24 Apr 2003 17:08:23 -0000	1.4
--- Dbm.py	12 Feb 2004 17:35:01 -0000	1.5
***************
*** 14,18 ****
 s = ''
 for key in self.keys():
! t = `key` + ': ' + `self[key]`
 if s: t = ', ' + t
 s = s + t
--- 14,18 ----
 s = ''
 for key in self.keys():
! t = repr(key) + ': ' + repr(self[key])
 if s: t = ', ' + t
 s = s + t
***************
*** 23,33 ****

 def __getitem__(self, key):
! return eval(self.db[`key`])

 def __setitem__(self, key, value):
! self.db[`key`] = `value`

 def __delitem__(self, key):
! del self.db[`key`]

 def keys(self):
--- 23,33 ----

 def __getitem__(self, key):
! return eval(self.db[repr(key)])

 def __setitem__(self, key, value):
! self.db[repr(key)] = repr(value)

 def __delitem__(self, key):
! del self.db[repr(key)]

 def keys(self):
***************
*** 38,42 ****

 def has_key(self, key):
! return self.db.has_key(`key`)

--- 38,42 ----

 def has_key(self, key):
! return self.db.has_key(repr(key))

Index: Range.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Demo/classes/Range.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Range.py	24 Apr 2003 17:08:23 -0000	1.5
--- Range.py	12 Feb 2004 17:35:01 -0000	1.6
***************
*** 35,41 ****
 self.len = max(0, int((self.stop - self.start) / self.step))

! # implement `x` and is also used by print x
 def __repr__(self):
! return 'range' + `self.start, self.stop, self.step`

 # implement len(x)
--- 35,41 ----
 self.len = max(0, int((self.stop - self.start) / self.step))

! # implement repr(x) and is also used by print x
 def __repr__(self):
! return 'range(%r, %r, %r)' % (self.start, self.stop, self.step)

 # implement len(x)
Index: bitvec.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Demo/classes/bitvec.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** bitvec.py	24 Apr 2003 17:08:24 -0000	1.4
--- bitvec.py	12 Feb 2004 17:35:01 -0000	1.5
***************
*** 21,25 ****
 bitmask = 1L << l
 if bitmask <= param:
! raise 'FATAL', '(param, l) = ' + `param, l`
 while l:
 bitmask = bitmask >> 1
--- 21,25 ----
 bitmask = 1L << l
 if bitmask <= param:
! raise 'FATAL', '(param, l) = %r' % ((param, l),)
 while l:
 bitmask = bitmask >> 1
***************
*** 168,175 ****
 def __repr__(self):
 ##rprt('<bitvec class instance object>.' + '__repr__()\n')
! return 'bitvec' + `self._data, self._len`

 def __cmp__(self, other, *rest):
! #rprt(`self`+'.__cmp__'+`(other, ) + rest`+'\n')
 if type(other) != type(self):
 other = apply(bitvec, (other, ) + rest)
--- 168,175 ----
 def __repr__(self):
 ##rprt('<bitvec class instance object>.' + '__repr__()\n')
! return 'bitvec(%r, %r)' % (self._data, self._len)

 def __cmp__(self, other, *rest):
! #rprt('%r.__cmp__%r\n' % (self, (other,) + rest))
 if type(other) != type(self):
 other = apply(bitvec, (other, ) + rest)
***************
*** 194,207 ****

 def __len__(self):
! #rprt(`self`+'.__len__()\n')
 return self._len

 def __getitem__(self, key):
! #rprt(`self`+'.__getitem__('+`key`+')\n')
 key = _check_key(self._len, key)
 return self._data & (1L << key) != 0

 def __setitem__(self, key, value):
! #rprt(`self`+'.__setitem__'+`key, value`+'\n')
 key = _check_key(self._len, key)
 #_check_value(value)
--- 194,207 ----

 def __len__(self):
! #rprt('%r.__len__()\n' % (self,))
 return self._len

 def __getitem__(self, key):
! #rprt('%r.__getitem__(%r)\n' % (self, key))
 key = _check_key(self._len, key)
 return self._data & (1L << key) != 0

 def __setitem__(self, key, value):
! #rprt('%r.__setitem__(%r, %r)\n' % (self, key, value))
 key = _check_key(self._len, key)
 #_check_value(value)
***************
*** 212,216 ****

 def __delitem__(self, key):
! #rprt(`self`+'.__delitem__('+`key`+')\n')
 key = _check_key(self._len, key)
 #el cheapo solution...
--- 212,216 ----

 def __delitem__(self, key):
! #rprt('%r.__delitem__(%r)\n' % (self, key))
 key = _check_key(self._len, key)
 #el cheapo solution...
***************
*** 219,223 ****

 def __getslice__(self, i, j):
! #rprt(`self`+'.__getslice__'+`i, j`+'\n')
 i, j = _check_slice(self._len, i, j)
 if i >= j:
--- 219,223 ----

 def __getslice__(self, i, j):
! #rprt('%r.__getslice__(%r, %r)\n' % (self, i, j))
 i, j = _check_slice(self._len, i, j)
 if i >= j:
***************
*** 235,239 ****

 def __setslice__(self, i, j, sequence, *rest):
! #rprt(`self`+'.__setslice__'+`(i, j, sequence) + rest`+'\n')
 i, j = _check_slice(self._len, i, j)
 if type(sequence) != type(self):
--- 235,239 ----

 def __setslice__(self, i, j, sequence, *rest):
! #rprt('%s.__setslice__%r\n' % (self, (i, j, sequence) + rest))
 i, j = _check_slice(self._len, i, j)
 if type(sequence) != type(self):
***************
*** 248,252 ****

 def __delslice__(self, i, j):
! #rprt(`self`+'.__delslice__'+`i, j`+'\n')
 i, j = _check_slice(self._len, i, j)
 if i == 0 and j == self._len:
--- 248,252 ----

 def __delslice__(self, i, j):
! #rprt('%r.__delslice__(%r, %r)\n' % (self, i, j))
 i, j = _check_slice(self._len, i, j)
 if i == 0 and j == self._len:
***************
*** 257,261 ****

 def __add__(self, other):
! #rprt(`self`+'.__add__('+`other`+')\n')
 retval = self.copy()
 retval[self._len:self._len] = other
--- 257,261 ----

 def __add__(self, other):
! #rprt('%r.__add__(%r)\n' % (self, other))
 retval = self.copy()
 retval[self._len:self._len] = other
***************
*** 263,267 ****

 def __mul__(self, multiplier):
! #rprt(`self`+'.__mul__('+`multiplier`+')\n')
 if type(multiplier) != type(0):
 raise TypeError, 'sequence subscript not int'
--- 263,267 ----

 def __mul__(self, multiplier):
! #rprt('%r.__mul__(%r)\n' % (self, multiplier))
 if type(multiplier) != type(0):
 raise TypeError, 'sequence subscript not int'
***************
*** 282,286 ****

 def __and__(self, otherseq, *rest):
! #rprt(`self`+'.__and__'+`(otherseq, ) + rest`+'\n')
 if type(otherseq) != type(self):
 otherseq = apply(bitvec, (otherseq, ) + rest)
--- 282,286 ----

 def __and__(self, otherseq, *rest):
! #rprt('%r.__and__%r\n' % (self, (otherseq,) + rest))
 if type(otherseq) != type(self):
 otherseq = apply(bitvec, (otherseq, ) + rest)
***************
*** 291,295 ****

 def __xor__(self, otherseq, *rest):
! #rprt(`self`+'.__xor__'+`(otherseq, ) + rest`+'\n')
 if type(otherseq) != type(self):
 otherseq = apply(bitvec, (otherseq, ) + rest)
--- 291,295 ----

 def __xor__(self, otherseq, *rest):
! #rprt('%r.__xor__%r\n' % (self, (otherseq,) + rest))
 if type(otherseq) != type(self):
 otherseq = apply(bitvec, (otherseq, ) + rest)
***************
*** 300,304 ****

 def __or__(self, otherseq, *rest):
! #rprt(`self`+'.__or__'+`(otherseq, ) + rest`+'\n')
 if type(otherseq) != type(self):
 otherseq = apply(bitvec, (otherseq, ) + rest)
--- 300,304 ----

 def __or__(self, otherseq, *rest):
! #rprt('%r.__or__%r\n' % (self, (otherseq,) + rest))
 if type(otherseq) != type(self):
 otherseq = apply(bitvec, (otherseq, ) + rest)
***************
*** 309,313 ****

 def __invert__(self):
! #rprt(`self`+'.__invert__()\n')
 return BitVec(~self._data & ((1L << self._len) - 1), \
 self._len)
--- 309,313 ----

 def __invert__(self):
! #rprt('%r.__invert__()\n' % (self,))
 return BitVec(~self._data & ((1L << self._len) - 1), \
 self._len)
***************
*** 315,319 ****
 def __coerce__(self, otherseq, *rest):
 #needed for *some* of the arithmetic operations
! #rprt(`self`+'.__coerce__'+`(otherseq, ) + rest`+'\n')
 if type(otherseq) != type(self):
 otherseq = apply(bitvec, (otherseq, ) + rest)
--- 315,319 ----
 def __coerce__(self, otherseq, *rest):
 #needed for *some* of the arithmetic operations
! #rprt('%r.__coerce__%r\n' % (self, (otherseq,) + rest))
 if type(otherseq) != type(self):
 otherseq = apply(bitvec, (otherseq, ) + rest)