diff options
author | Walter Dörwald <walter@livinglogic.de> | 2004-02-12 17:35:32 (GMT) |
---|---|---|
committer | Walter Dörwald <walter@livinglogic.de> | 2004-02-12 17:35:32 (GMT) |
commit | 70a6b49821a3226f55e9716f32d802d06640cb89 (patch) | |
tree | 3c8ca10c1fa09e025bd266cf855a00d7d96c55aa /Lib/plat-irix6 | |
parent | ecfeb7f095dfd9c1c8929bf3df858ee35e0d9e9e (diff) | |
download | cpython-70a6b49821a3226f55e9716f32d802d06640cb89.zip cpython-70a6b49821a3226f55e9716f32d802d06640cb89.tar.gz cpython-70a6b49821a3226f55e9716f32d802d06640cb89.tar.bz2 |
Replace backticks with repr() or "%r"
From SF patch #852334.
Diffstat (limited to 'Lib/plat-irix6')
-rw-r--r-- | Lib/plat-irix6/cddb.py | 8 | ||||
-rw-r--r-- | Lib/plat-irix6/cdplayer.py | 3 | ||||
-rw-r--r-- | Lib/plat-irix6/flp.py | 4 | ||||
-rw-r--r-- | Lib/plat-irix6/panel.py | 2 | ||||
-rw-r--r-- | Lib/plat-irix6/readcd.py | 4 | ||||
-rw-r--r-- | Lib/plat-irix6/torgb.py | 5 |
6 files changed, 11 insertions, 15 deletions
diff --git a/Lib/plat-irix6/cddb.py b/Lib/plat-irix6/cddb.py index 96025e7..e96e99e 100644 --- a/Lib/plat-irix6/cddb.py +++ b/Lib/plat-irix6/cddb.py @@ -111,9 +111,7 @@ class Cddb: print 'syntax error in ' + file continue if trackno > ntracks: - print 'track number ' + `trackno` + \ - ' in file ' + file + \ - ' out of range' + print 'track number %r in file %s out of range' % (trackno, file) continue if name2 == 'title': self.track[trackno] = value @@ -191,7 +189,7 @@ class Cddb: prevpref = None for i in range(1, len(self.track)): if self.trackartist[i]: - f.write('track'+`i`+'.artist:\t'+self.trackartist[i]+'\n') + f.write('track%r.artist:\t%s\n' % (i, self.trackartist[i]) track = self.track[i] try: off = track.index(',') @@ -202,5 +200,5 @@ class Cddb: track = track[off:] else: prevpref = track[:off] - f.write('track' + `i` + '.title:\t' + track + '\n') + f.write('track%r.title:\t%s\n' % (i, track)) f.close() diff --git a/Lib/plat-irix6/cdplayer.py b/Lib/plat-irix6/cdplayer.py index c665a07..4ba3f51 100644 --- a/Lib/plat-irix6/cdplayer.py +++ b/Lib/plat-irix6/cdplayer.py @@ -82,8 +82,7 @@ class Cdplayer: new.write(self.id + '.title:\t' + self.title + '\n') new.write(self.id + '.artist:\t' + self.artist + '\n') for i in range(1, len(self.track)): - new.write(self.id + '.track.' + `i` + ':\t' + \ - self.track[i] + '\n') + new.write('%s.track.%r:\t%s\n' % (i, track)) old.close() new.close() posix.rename(filename + '.new', filename) diff --git a/Lib/plat-irix6/flp.py b/Lib/plat-irix6/flp.py index 6530487..aa23107 100644 --- a/Lib/plat-irix6/flp.py +++ b/Lib/plat-irix6/flp.py @@ -145,7 +145,7 @@ def freeze(filename): forms = parse_forms(filename) altforms = _pack_cache(forms) print 'import flp' - print 'flp._internal_cache[', `filename`, '] =', altforms + print 'flp._internal_cache[', repr(filename), '] =', altforms # # Internal: create the data structure to be placed in the cache @@ -416,7 +416,7 @@ def _select_crfunc(fm, cl): elif cl == FL.TEXT: return fm.add_text elif cl == FL.TIMER: return fm.add_timer else: - raise error, 'Unknown object type: ' + `cl` + raise error, 'Unknown object type: %r' % (cl,) def test(): diff --git a/Lib/plat-irix6/panel.py b/Lib/plat-irix6/panel.py index f8388c6..3aa7448 100644 --- a/Lib/plat-irix6/panel.py +++ b/Lib/plat-irix6/panel.py @@ -127,7 +127,7 @@ def assign_members(target, attrlist, exclist, prefix): ok = 0 if ok: lhs = 'target.' + prefix + name - stmt = lhs + '=' + `value` + stmt = lhs + '=' + repr(value) if debug: print 'exec', stmt try: exec stmt + '\n' diff --git a/Lib/plat-irix6/readcd.py b/Lib/plat-irix6/readcd.py index e000d35..f278ba4 100644 --- a/Lib/plat-irix6/readcd.py +++ b/Lib/plat-irix6/readcd.py @@ -9,7 +9,7 @@ class _Stop(Exception): def _doatime(self, cb_type, data): if ((data[0] * 60) + data[1]) * 75 + data[2] > self.end: -## print 'done with list entry',`self.listindex` +## print 'done with list entry', repr(self.listindex) raise _Stop func, arg = self.callbacks[cb_type] if func: @@ -17,7 +17,7 @@ def _doatime(self, cb_type, data): def _dopnum(self, cb_type, data): if data > self.end: -## print 'done with list entry',`self.listindex` +## print 'done with list entry', repr(self.listindex) raise _Stop func, arg = self.callbacks[cb_type] if func: diff --git a/Lib/plat-irix6/torgb.py b/Lib/plat-irix6/torgb.py index 6208289..c2b1740 100644 --- a/Lib/plat-irix6/torgb.py +++ b/Lib/plat-irix6/torgb.py @@ -85,13 +85,12 @@ def _torgb(filename, temps): type(msg[0]) == type(0) and type(msg[1]) == type(''): msg = msg[1] if type(msg) is not type(''): - msg = `msg` + msg = repr(msg) raise error, filename + ': ' + msg if ftype == 'rgb': return fname if ftype is None or not table.has_key(ftype): - raise error, \ - filename + ': unsupported image file type ' + `ftype` + raise error, '%s: unsupported image file type %r' % (filename, ftype) (fd, temp) = tempfile.mkstemp() os.close(fd) sts = table[ftype].copy(fname, temp) |