Replace backticks with repr() or "%r"
From SF patch #852334.
diff --git a/Doc/tools/sgmlconv/esistools.py b/Doc/tools/sgmlconv/esistools.py
index b9c029b..833fea1 100644
--- a/Doc/tools/sgmlconv/esistools.py
+++ b/Doc/tools/sgmlconv/esistools.py
@@ -29,7 +29,7 @@
n, s = s.split(";", 1)
r = r + unichr(int(n))
else:
- raise ValueError, "can't handle " + `s`
+ raise ValueError, "can't handle %r" % s
return r
@@ -220,8 +220,8 @@
return self._decl_handler
else:
- raise xml.sax.SAXNotRecognizedException("unknown property %s"
- % `property`)
+ raise xml.sax.SAXNotRecognizedException("unknown property %r"
+ % (property, ))
def setProperty(self, property, value):
if property == xml.sax.handler.property_lexical_handler:
diff --git a/Doc/tools/sgmlconv/latex2esis.py b/Doc/tools/sgmlconv/latex2esis.py
index 47739a6..b30aaa5 100755
--- a/Doc/tools/sgmlconv/latex2esis.py
+++ b/Doc/tools/sgmlconv/latex2esis.py
@@ -73,8 +73,8 @@
class _Stack(list):
def append(self, entry):
if not isinstance(entry, str):
- raise LaTeXFormatError("cannot push non-string on stack: "
- + `entry`)
+ raise LaTeXFormatError("cannot push non-string on stack: %r"
+ % (entry, ))
#dbgmsg("%s<%s>" % (" "*len(self.data), entry))
list.append(self, entry)
@@ -208,8 +208,8 @@
m = _parameter_rx.match(line)
if not m:
raise LaTeXFormatError(
- "could not extract parameter %s for %s: %s"
- % (pentry.name, macroname, `line[:100]`))
+ "could not extract parameter %s for %s: %r"
+ % (pentry.name, macroname, line[:100]))
if entry.outputname:
self.dump_attr(pentry, m.group(1))
line = line[m.end():]
@@ -259,7 +259,7 @@
opened = 1
stack.append(entry.name)
self.write("(%s\n" % entry.outputname)
- #dbgmsg("--- text: %s" % `pentry.text`)
+ #dbgmsg("--- text: %r" % pentry.text)
self.write("-%s\n" % encode(pentry.text))
elif pentry.type == "entityref":
self.write("&%s\n" % pentry.name)
@@ -326,8 +326,8 @@
extra = ""
if len(line) > 100:
extra = "..."
- raise LaTeXFormatError("could not identify markup: %s%s"
- % (`line[:100]`, extra))
+ raise LaTeXFormatError("could not identify markup: %r%s"
+ % (line[:100], extra))
while stack:
entry = self.get_entry(stack[-1])
if entry.closes:
@@ -361,7 +361,7 @@
def get_entry(self, name):
entry = self.table.get(name)
if entry is None:
- dbgmsg("get_entry(%s) failing; building default entry!" % `name`)
+ dbgmsg("get_entry(%r) failing; building default entry!" % (name, ))
# not defined; build a default entry:
entry = TableEntry(name)
entry.has_content = 1
@@ -486,7 +486,7 @@
def end_macro(self):
name = self.__current.name
if self.__table.has_key(name):
- raise ValueError("name %s already in use" % `name`)
+ raise ValueError("name %r already in use" % (name,))
self.__table[name] = self.__current
self.__current = None