Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 70a6b49

Browse files
doerwalterdoerwalter
committed
Replace backticks with repr() or "%r"
From SF patch #852334.
1 parent ecfeb7f commit 70a6b49

246 files changed

Lines changed: 926 additions & 962 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Demo/classes/Complex.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ def __hash__(self):
117117

118118
def __repr__(self):
119119
if not self.im:
120-
return 'Complex(%s)' % `self.re`
120+
return 'Complex(%r)' % (self.re,)
121121
else:
122-
return 'Complex(%s, %s)' % (`self.re`, `self.im`)
122+
return 'Complex(%r, %r)' % (self.re, self.im)
123123

124124
def __str__(self):
125125
if not self.im:
126-
return `self.re`
126+
return repr(self.re)
127127
else:
128-
return 'Complex(%s, %s)' % (`self.re`, `self.im`)
128+
return 'Complex(%r, %r)' % (self.re, self.im)
129129

130130
def __neg__(self):
131131
return Complex(-self.re, -self.im)

‎Demo/classes/Dates.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def _date2num( date ): # compute ordinal of date.month,day,year
8686

8787
def _num2date( n ): # return date with ordinal n
8888
if type(n) not in _INT_TYPES:
89-
raise TypeError, 'argument must be integer: ' + `type(n)`
89+
raise TypeError, 'argument must be integer: %r' % type(n)
9090

9191
ans = Date(1,1,1) # arguments irrelevant; just getting a Date obj
9292
del ans.ord, ans.month, ans.day, ans.year # un-initialize it
@@ -120,10 +120,10 @@ def _num2day( n ): # return weekday name of day with ordinal n
120120
class Date:
121121
def __init__( self, month, day, year ):
122122
if not 1 <= month <= 12:
123-
raise ValueError, 'month must be in 1..12: ' + `month`
123+
raise ValueError, 'month must be in 1..12: %r' % (month,)
124124
dim = _days_in_month( month, year )
125125
if not 1 <= day <= dim:
126-
raise ValueError, 'day must be in 1..' + `dim` + ': ' + `day`
126+
raise ValueError, 'day must be in 1..%r: %r' % (dim, day)
127127
self.month, self.day, self.year = month, day, year
128128
self.ord = _date2num( self )
129129

@@ -142,15 +142,16 @@ def __hash__( self ):
142142

143143
# print as, e.g., Mon 16 Aug 1993
144144
def __repr__( self ):
145-
return '%.3s %2d %.3s ' % (
145+
return '%.3s %2d %.3s %r' % (
146146
self.weekday(),
147147
self.day,
148-
_MONTH_NAMES[self.month-1] ) + `self.year`
148+
_MONTH_NAMES[self.month-1],
149+
self.year)
149150

150151
# Python 1.1 coerces neither int+date nor date+int
151152
def __add__( self, n ):
152153
if type(n) not in _INT_TYPES:
153-
raise TypeError, 'can\'t add ' + `type(n)` + ' to date'
154+
raise TypeError, 'can\'t add %r to date' % type(n)
154155
return _num2date( self.ord + n )
155156
__radd__ = __add__ # handle int+date
156157

@@ -177,7 +178,7 @@ def today():
177178
def test( firstyear, lastyear ):
178179
a = Date(9,30,1913)
179180
b = Date(9,30,1914)
180-
if `a` != 'Tue 30 Sep 1913':
181+
if repr(a) != 'Tue 30 Sep 1913':
181182
raise DateTestError, '__repr__ failure'
182183
if (not a < b) or a == b or a > b or b != b:
183184
raise DateTestError, '__cmp__ failure'

‎Demo/classes/Dbm.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def __init__(self, filename, mode, perm):
1313
def __repr__(self):
1414
s = ''
1515
for key in self.keys():
16-
t = `key` + ': ' + `self[key]`
16+
t = repr(key) + ': ' + repr(self[key])
1717
if s: t = ', ' + t
1818
s = s + t
1919
return '{' + s + '}'
@@ -22,13 +22,13 @@ def __len__(self):
2222
return len(self.db)
2323

2424
def __getitem__(self, key):
25-
return eval(self.db[`key`])
25+
return eval(self.db[repr(key)])
2626

2727
def __setitem__(self, key, value):
28-
self.db[`key`] = `value`
28+
self.db[repr(key)] = repr(value)
2929

3030
def __delitem__(self, key):
31-
del self.db[`key`]
31+
del self.db[repr(key)]
3232

3333
def keys(self):
3434
res = []
@@ -37,7 +37,7 @@ def keys(self):
3737
return res
3838

3939
def has_key(self, key):
40-
return self.db.has_key(`key`)
40+
return self.db.has_key(repr(key))
4141

4242

4343
def test():

‎Demo/classes/Range.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ def __init__(self, start, stop, step):
3434
self.step = step
3535
self.len = max(0, int((self.stop - self.start) / self.step))
3636

37-
# implement `x` and is also used by print x
37+
# implement repr(x) and is also used by print x
3838
def __repr__(self):
39-
return 'range' + `self.start, self.stop, self.step`
39+
return 'range(%r, %r, %r)' % (self.start, self.stop, self.step)
4040

4141
# implement len(x)
4242
def __len__(self):

‎Demo/classes/bitvec.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def _compute_len(param):
2020
mant, l = math.frexp(float(param))
2121
bitmask = 1L << l
2222
if bitmask <= param:
23-
raise 'FATAL', '(param, l) = ' + `param, l`
23+
raise 'FATAL', '(param, l) = %r' % ((param, l),)
2424
while l:
2525
bitmask = bitmask >> 1
2626
if param & bitmask:
@@ -167,10 +167,10 @@ def seq(self):
167167

168168
def __repr__(self):
169169
##rprt('<bitvec class instance object>.' + '__repr__()\n')
170-
return 'bitvec' + `self._data, self._len`
170+
return 'bitvec(%r, %r)' % (self._data, self._len)
171171

172172
def __cmp__(self, other, *rest):
173-
#rprt(`self`+'.__cmp__'+`(other, ) + rest`+'\n')
173+
#rprt('%r.__cmp__%r\n' % (self, (other,) + rest))
174174
if type(other) != type(self):
175175
other = apply(bitvec, (other, ) + rest)
176176
#expensive solution... recursive binary, with slicing
@@ -193,16 +193,16 @@ def __cmp__(self, other, *rest):
193193

194194

195195
def __len__(self):
196-
#rprt(`self`+'.__len__()\n')
196+
#rprt('%r.__len__()\n' % (self,))
197197
return self._len
198198

199199
def __getitem__(self, key):
200-
#rprt(`self`+'.__getitem__('+`key`+')\n')
200+
#rprt('%r.__getitem__(%r)\n' % (self, key))
201201
key = _check_key(self._len, key)
202202
return self._data & (1L << key) != 0
203203

204204
def __setitem__(self, key, value):
205-
#rprt(`self`+'.__setitem__'+`key, value`+'\n')
205+
#rprt('%r.__setitem__(%r, %r)\n' % (self, key, value))
206206
key = _check_key(self._len, key)
207207
#_check_value(value)
208208
if value:
@@ -211,14 +211,14 @@ def __setitem__(self, key, value):
211211
self._data = self._data & ~(1L << key)
212212

213213
def __delitem__(self, key):
214-
#rprt(`self`+'.__delitem__('+`key`+')\n')
214+
#rprt('%r.__delitem__(%r)\n' % (self, key))
215215
key = _check_key(self._len, key)
216216
#el cheapo solution...
217217
self._data = self[:key]._data | self[key+1:]._data >> key
218218
self._len = self._len - 1
219219

220220
def __getslice__(self, i, j):
221-
#rprt(`self`+'.__getslice__'+`i, j`+'\n')
221+
#rprt('%r.__getslice__(%r, %r)\n' % (self, i, j))
222222
i, j = _check_slice(self._len, i, j)
223223
if i >= j:
224224
return BitVec(0L, 0)
@@ -234,7 +234,7 @@ def __getslice__(self, i, j):
234234
return BitVec(ndata, nlength)
235235

236236
def __setslice__(self, i, j, sequence, *rest):
237-
#rprt(`self`+'.__setslice__'+`(i, j, sequence) + rest`+'\n')
237+
#rprt('%s.__setslice__%r\n' % (self, (i, j, sequence) + rest))
238238
i, j = _check_slice(self._len, i, j)
239239
if type(sequence) != type(self):
240240
sequence = apply(bitvec, (sequence, ) + rest)
@@ -247,7 +247,7 @@ def __setslice__(self, i, j, sequence, *rest):
247247
self._len = self._len - j + i + sequence._len
248248

249249
def __delslice__(self, i, j):
250-
#rprt(`self`+'.__delslice__'+`i, j`+'\n')
250+
#rprt('%r.__delslice__(%r, %r)\n' % (self, i, j))
251251
i, j = _check_slice(self._len, i, j)
252252
if i == 0 and j == self._len:
253253
self._data, self._len = 0L, 0
@@ -256,13 +256,13 @@ def __delslice__(self, i, j):
256256
self._len = self._len - j + i
257257

258258
def __add__(self, other):
259-
#rprt(`self`+'.__add__('+`other`+')\n')
259+
#rprt('%r.__add__(%r)\n' % (self, other))
260260
retval = self.copy()
261261
retval[self._len:self._len] = other
262262
return retval
263263

264264
def __mul__(self, multiplier):
265-
#rprt(`self`+'.__mul__('+`multiplier`+')\n')
265+
#rprt('%r.__mul__(%r)\n' % (self, multiplier))
266266
if type(multiplier) != type(0):
267267
raise TypeError, 'sequence subscript not int'
268268
if multiplier <= 0:
@@ -281,7 +281,7 @@ def __mul__(self, multiplier):
281281
return retval
282282

283283
def __and__(self, otherseq, *rest):
284-
#rprt(`self`+'.__and__'+`(otherseq, ) + rest`+'\n')
284+
#rprt('%r.__and__%r\n' % (self, (otherseq,) + rest))
285285
if type(otherseq) != type(self):
286286
otherseq = apply(bitvec, (otherseq, ) + rest)
287287
#sequence is now of our own type
@@ -290,7 +290,7 @@ def __and__(self, otherseq, *rest):
290290

291291

292292
def __xor__(self, otherseq, *rest):
293-
#rprt(`self`+'.__xor__'+`(otherseq, ) + rest`+'\n')
293+
#rprt('%r.__xor__%r\n' % (self, (otherseq,) + rest))
294294
if type(otherseq) != type(self):
295295
otherseq = apply(bitvec, (otherseq, ) + rest)
296296
#sequence is now of our own type
@@ -299,7 +299,7 @@ def __xor__(self, otherseq, *rest):
299299

300300

301301
def __or__(self, otherseq, *rest):
302-
#rprt(`self`+'.__or__'+`(otherseq, ) + rest`+'\n')
302+
#rprt('%r.__or__%r\n' % (self, (otherseq,) + rest))
303303
if type(otherseq) != type(self):
304304
otherseq = apply(bitvec, (otherseq, ) + rest)
305305
#sequence is now of our own type
@@ -308,13 +308,13 @@ def __or__(self, otherseq, *rest):
308308

309309

310310
def __invert__(self):
311-
#rprt(`self`+'.__invert__()\n')
311+
#rprt('%r.__invert__()\n' % (self,))
312312
return BitVec(~self._data & ((1L << self._len) - 1), \
313313
self._len)
314314

315315
def __coerce__(self, otherseq, *rest):
316316
#needed for *some* of the arithmetic operations
317-
#rprt(`self`+'.__coerce__'+`(otherseq, ) + rest`+'\n')
317+
#rprt('%r.__coerce__%r\n' % (self, (otherseq,) + rest))
318318
if type(otherseq) != type(self):
319319
otherseq = apply(bitvec, (otherseq, ) + rest)
320320
return self, otherseq

‎Demo/metaclasses/Enum.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ def __int__(self):
107107
return self.__value
108108

109109
def __repr__(self):
110-
return "EnumInstance(%s, %s, %s)" % (`self.__classname`,
111-
`self.__enumname`,
112-
`self.__value`)
110+
return "EnumInstance(%r, %r, %r)" % (self.__classname,
111+
self.__enumname,
112+
self.__value)
113113

114114
def __str__(self):
115115
return "%s.%s" % (self.__classname, self.__enumname)

‎Demo/metaclasses/Meta.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class C(Meta):
9898
def __init__(self, *args):
9999
print "__init__, args =", args
100100
def m1(self, x):
101-
print "m1(x=%s)" %`x`
101+
print "m1(x=%r)" % (x,)
102102
print C
103103
x = C()
104104
print x

‎Demo/metaclasses/Trace.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def m1(self, x): self.x = x
117117
def m2(self, y): return self.x + y
118118
__trace_output__ = sys.stdout
119119
class D(C):
120-
def m2(self, y): print "D.m2(%s)" % `y`; return C.m2(self, y)
120+
def m2(self, y): print "D.m2(%r)" % (y,); return C.m2(self, y)
121121
__trace_output__ = None
122122
x = C(4321)
123123
print x

‎Demo/newmetaclasses/Enum.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class Color(Enum):
9797

9898
print Color.red
9999

100-
print `Color.red`
100+
print repr(Color.red)
101101
print Color.red == Color.red
102102
print Color.red == Color.blue
103103
print Color.red == 1
@@ -139,7 +139,7 @@ class Color(FullEnum):
139139

140140
print Color.red
141141

142-
print `Color.red`
142+
print repr(Color.red)
143143
print Color.red == Color.red
144144
print Color.red == Color.blue
145145
print Color.red == 1

‎Demo/pdist/RCSProxy.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ def test():
188188
if callable(attr):
189189
print apply(attr, tuple(sys.argv[2:]))
190190
else:
191-
print `attr`
191+
print repr(attr)
192192
else:
193193
print "%s: no such attribute" % what
194194
sys.exit(2)

0 commit comments

Comments
 (0)