Replace backticks with repr() or "%r"
From SF patch #852334.
diff --git a/Mac/Demo/PICTbrowse/ICONbrowse.py b/Mac/Demo/PICTbrowse/ICONbrowse.py
index 42ae96d..1194b7e 100644
--- a/Mac/Demo/PICTbrowse/ICONbrowse.py
+++ b/Mac/Demo/PICTbrowse/ICONbrowse.py
@@ -52,7 +52,7 @@
def showICON(self, resid):
w = ICONwindow(self)
w.open(resid)
- #EasyDialogs.Message('Show ICON '+`resid`)
+ #EasyDialogs.Message('Show ICON %r' % (resid,))
def findICONresources(self):
num = Res.CountResources('ICON')
@@ -70,7 +70,7 @@
class ICONwindow(FrameWork.Window):
def open(self, (resid, resname)):
if not resname:
- resname = '#'+`resid`
+ resname = '#%r' % (resid,)
self.resid = resid
self.picture = Icn.GetIcon(self.resid)
l, t, r, b = 0, 0, 32, 32
@@ -127,7 +127,7 @@
if self.contents:
self.list.LAddRow(len(self.contents), 0)
for i in range(len(self.contents)):
- v = `self.contents[i][0]`
+ v = repr(self.contents[i][0])
if self.contents[i][1]:
v = v + '"' + self.contents[i][1] + '"'
self.list.LSetCell(v, (0, i))
diff --git a/Mac/Demo/PICTbrowse/PICTbrowse.py b/Mac/Demo/PICTbrowse/PICTbrowse.py
index 41ffa5c..eace869 100644
--- a/Mac/Demo/PICTbrowse/PICTbrowse.py
+++ b/Mac/Demo/PICTbrowse/PICTbrowse.py
@@ -47,7 +47,7 @@
def showPICT(self, resid):
w = PICTwindow(self)
w.open(resid)
- #EasyDialogs.Message('Show PICT '+`resid`)
+ #EasyDialogs.Message('Show PICT %r' % (resid,))
def findPICTresources(self):
num = Res.CountResources('PICT')
@@ -65,11 +65,11 @@
class PICTwindow(FrameWork.Window):
def open(self, (resid, resname)):
if not resname:
- resname = '#'+`resid`
+ resname = '#%r' % (resid,)
self.resid = resid
picture = Qd.GetPicture(self.resid)
# Get rect for picture
- print `picture.data[:16]`
+ print repr(picture.data[:16])
sz, t, l, b, r = struct.unpack('hhhhh', picture.data[:10])
print 'pict:', t, l, b, r
width = r-l
@@ -105,7 +105,7 @@
if self.contents:
self.list.LAddRow(len(self.contents), 0)
for i in range(len(self.contents)):
- v = `self.contents[i][0]`
+ v = repr(self.contents[i][0])
if self.contents[i][1]:
v = v + '"' + self.contents[i][1] + '"'
self.list.LSetCell(v, (0, i))
diff --git a/Mac/Demo/PICTbrowse/PICTbrowse2.py b/Mac/Demo/PICTbrowse/PICTbrowse2.py
index da389c0..875c99b 100644
--- a/Mac/Demo/PICTbrowse/PICTbrowse2.py
+++ b/Mac/Demo/PICTbrowse/PICTbrowse2.py
@@ -51,7 +51,7 @@
def showPICT(self, resid):
w = PICTwindow(self)
w.open(resid)
- #EasyDialogs.Message('Show PICT '+`resid`)
+ #EasyDialogs.Message('Show PICT %r' % (resid,))
def findPICTresources(self):
num = Res.CountResources('PICT')
@@ -69,7 +69,7 @@
class PICTwindow(FrameWork.Window):
def open(self, (resid, resname)):
if not resname:
- resname = '#'+`resid`
+ resname = '#%r' % (resid,)
self.resid = resid
self.picture = Qd.GetPicture(self.resid)
# Get rect for picture
@@ -127,7 +127,7 @@
if self.contents:
self.list.LAddRow(len(self.contents), 0)
for i in range(len(self.contents)):
- v = `self.contents[i][0]`
+ v = repr(self.contents[i][0])
if self.contents[i][1]:
v = v + '"' + self.contents[i][1] + '"'
self.list.LSetCell(v, (0, i))
diff --git a/Mac/Demo/PICTbrowse/cicnbrowse.py b/Mac/Demo/PICTbrowse/cicnbrowse.py
index b90143e..e3d7972 100644
--- a/Mac/Demo/PICTbrowse/cicnbrowse.py
+++ b/Mac/Demo/PICTbrowse/cicnbrowse.py
@@ -52,7 +52,7 @@
def showCIcon(self, resid):
w = CIconwindow(self)
w.open(resid)
- #EasyDialogs.Message('Show cicn '+`resid`)
+ #EasyDialogs.Message('Show cicn %r' % (resid,))
def findcicnresources(self):
num = Res.CountResources('cicn')
@@ -70,7 +70,7 @@
class CIconwindow(FrameWork.Window):
def open(self, (resid, resname)):
if not resname:
- resname = '#'+`resid`
+ resname = '#%r' % (resid,)
self.resid = resid
self.picture = Icn.GetCIcon(self.resid)
l, t, r, b = 0, 0, 32, 32
@@ -127,7 +127,7 @@
if self.contents:
self.list.LAddRow(len(self.contents), 0)
for i in range(len(self.contents)):
- v = `self.contents[i][0]`
+ v = repr(self.contents[i][0])
if self.contents[i][1]:
v = v + '"' + self.contents[i][1] + '"'
self.list.LSetCell(v, (0, i))
diff --git a/Mac/Demo/PICTbrowse/oldPICTbrowse.py b/Mac/Demo/PICTbrowse/oldPICTbrowse.py
index dc1f5b4..5f5893c 100644
--- a/Mac/Demo/PICTbrowse/oldPICTbrowse.py
+++ b/Mac/Demo/PICTbrowse/oldPICTbrowse.py
@@ -46,7 +46,7 @@
def showPICT(self, resid):
w = PICTwindow(self)
w.open(resid)
- #EasyDialogs.Message('Show PICT '+`resid`)
+ #EasyDialogs.Message('Show PICT %r' % (resid,))
def findPICTresources(self):
num = Res.CountResources('PICT')
@@ -64,11 +64,11 @@
class PICTwindow(FrameWork.Window):
def open(self, (resid, resname)):
if not resname:
- resname = '#'+`resid`
+ resname = '#%r' % (resid,)
self.resid = resid
picture = Qd.GetPicture(self.resid)
# Get rect for picture
- print `picture.data[:16]`
+ print repr(picture.data[:16])
sz, t, l, b, r = struct.unpack('hhhhh', picture.data[:10])
print 'pict:', t, l, b, r
width = r-l
@@ -104,7 +104,7 @@
if self.contents:
self.list.LAddRow(len(self.contents), 0)
for i in range(len(self.contents)):
- v = `self.contents[i][0]`
+ v = repr(self.contents[i][0])
if self.contents[i][1]:
v = v + '"' + self.contents[i][1] + '"'
self.list.LSetCell(v, (0, i))