[Checkins] SVN: zope.tal/trunk/src/zope/tal/ Towards Py3K: use repr() instead of backticks
Marius Gedminas
cvs-admin at zope.org
Thu Feb 7 16:02:50 UTC 2013
Log message for revision 129172:
Towards Py3K: use repr() instead of backticks
Changed:
U zope.tal/trunk/src/zope/tal/dummyengine.py
U zope.tal/trunk/src/zope/tal/htmltalparser.py
U zope.tal/trunk/src/zope/tal/ndiff.py
U zope.tal/trunk/src/zope/tal/talgenerator.py
U zope.tal/trunk/src/zope/tal/talinterpreter.py
-=-
Modified: zope.tal/trunk/src/zope/tal/dummyengine.py
===================================================================
--- zope.tal/trunk/src/zope/tal/dummyengine.py 2013-02-07 16:02:46 UTC (rev 129171)
+++ zope.tal/trunk/src/zope/tal/dummyengine.py 2013-02-07 16:02:50 UTC (rev 129172)
@@ -106,7 +106,7 @@
try:
return eval(expr, self.globals, self.locals)
except:
- raise TALExpressionError("evaluation error in %s" % `expr`)
+ raise TALExpressionError("evaluation error in %s" % repr(expr))
if type == "position":
# Insert the current source file name, line number,
# and column offset.
@@ -115,7 +115,7 @@
else:
lineno, offset = None, None
return '%s (%s,%s)' % (self.source_file, lineno, offset)
- raise TALExpressionError("unrecognized expression: " + `expression`)
+ raise TALExpressionError("unrecognized expression: " + repr(expression))
# implementation; can be overridden
def evaluatePathOrVar(self, expr):
@@ -125,7 +125,7 @@
elif self.globals.has_key(expr):
return self.globals[expr]
else:
- raise TALExpressionError("unknown variable: %s" % `expr`)
+ raise TALExpressionError("unknown variable: %s" % repr(expr))
def evaluateValue(self, expr):
return self.evaluate(expr)
Modified: zope.tal/trunk/src/zope/tal/htmltalparser.py
===================================================================
--- zope.tal/trunk/src/zope/tal/htmltalparser.py 2013-02-07 16:02:46 UTC (rev 129171)
+++ zope.tal/trunk/src/zope/tal/htmltalparser.py 2013-02-07 16:02:50 UTC (rev 129172)
@@ -141,7 +141,7 @@
= self.process_ns(tag, attrs)
if tag in EMPTY_HTML_TAGS and "content" in taldict:
raise TALError(
- "empty HTML tags cannot use tal:content: %s" % `tag`,
+ "empty HTML tags cannot use tal:content: %s" % repr(tag),
self.getpos())
# Support for inline Python code.
if tag == 'script':
@@ -163,7 +163,7 @@
if "content" in taldict:
if tag in EMPTY_HTML_TAGS:
raise TALError(
- "empty HTML tags cannot use tal:content: %s" % `tag`,
+ "empty HTML tags cannot use tal:content: %s" % repr(tag),
self.getpos())
self.gen.emitStartElement(tag, attrlist, taldict, metaldict,
i18ndict, self.getpos())
Modified: zope.tal/trunk/src/zope/tal/ndiff.py
===================================================================
--- zope.tal/trunk/src/zope/tal/ndiff.py 2013-02-07 16:02:46 UTC (rev 129171)
+++ zope.tal/trunk/src/zope/tal/ndiff.py 2013-02-07 16:02:50 UTC (rev 129172)
@@ -512,7 +512,7 @@
atags = atags + ' ' * la
btags = btags + ' ' * lb
else:
- raise ValueError('unknown tag ' + `tag`)
+ raise ValueError('unknown tag ' + repr(tag))
printq(aelt, belt, atags, btags)
else:
# the synch pair is identical
@@ -586,7 +586,7 @@
elif tag == 'equal':
dump(' ', a, alo, ahi)
else:
- raise ValueError('unknown tag ' + `tag`)
+ raise ValueError('unknown tag ' + repr(tag))
return 1
Modified: zope.tal/trunk/src/zope/tal/talgenerator.py
===================================================================
--- zope.tal/trunk/src/zope/tal/talgenerator.py 2013-02-07 16:02:46 UTC (rev 129171)
+++ zope.tal/trunk/src/zope/tal/talgenerator.py 2013-02-07 16:02:50 UTC (rev 129172)
@@ -198,7 +198,7 @@
try:
return self.expressionCompiler.compile(expr)
except self.CompilerError as err:
- raise TALError('%s in expression %s' % (err.args[0], `expr`),
+ raise TALError('%s in expression %s' % (err.args[0], repr(expr)),
self.position)
def pushProgram(self):
@@ -259,7 +259,7 @@
m = re.match(
r"(?s)\s*(?:(global|local)\s+)?(%s)\s+(.*)\Z" % NAME_RE, part)
if not m:
- raise TALError("invalid define syntax: " + `part`,
+ raise TALError("invalid define syntax: " + repr(part),
self.position)
scope, name, expr = m.group(1, 2, 3)
scope = scope or "local"
@@ -293,7 +293,7 @@
def emitRepeat(self, arg):
m = re.match("(?s)\s*(%s)\s+(.*)\Z" % NAME_RE, arg)
if not m:
- raise TALError("invalid repeat syntax: " + `arg`,
+ raise TALError("invalid repeat syntax: " + repr(arg),
self.position)
name, expr = m.group(1, 2)
cexpr = self.compileExpression(expr)
@@ -347,10 +347,10 @@
program = self.popProgram()
macroName = macroName.strip()
if self.macros.has_key(macroName):
- raise METALError("duplicate macro definition: %s" % `macroName`,
+ raise METALError("duplicate macro definition: %s" % repr(macroName),
self.position)
if not re.match('%s$' % NAME_RE, macroName):
- raise METALError("invalid macro name: %s" % `macroName`,
+ raise METALError("invalid macro name: %s" % repr(macroName),
self.position)
self.macros[macroName] = program
self.inMacroDef = self.inMacroDef - 1
@@ -374,7 +374,7 @@
program = self.popProgram()
slotName = slotName.strip()
if not re.match('%s$' % NAME_RE, slotName):
- raise METALError("invalid slot name: %s" % `slotName`,
+ raise METALError("invalid slot name: %s" % repr(slotName),
self.position)
self.emit("defineSlot", slotName, program)
@@ -382,10 +382,10 @@
program = self.popProgram()
slotName = slotName.strip()
if self.slots.has_key(slotName):
- raise METALError("duplicate fill-slot name: %s" % `slotName`,
+ raise METALError("duplicate fill-slot name: %s" % repr(slotName),
self.position)
if not re.match('%s$' % NAME_RE, slotName):
- raise METALError("invalid slot name: %s" % `slotName`,
+ raise METALError("invalid slot name: %s" % repr(slotName),
self.position)
self.slots[slotName] = program
self.inMacroUse = 1
@@ -484,23 +484,23 @@
for key, value in taldict.items():
if key not in taldefs.KNOWN_TAL_ATTRIBUTES:
- raise TALError("bad TAL attribute: " + `key`, position)
+ raise TALError("bad TAL attribute: " + repr(key), position)
if not (value or key == 'omit-tag'):
raise TALError("missing value for TAL attribute: " +
- `key`, position)
+ repr(key), position)
for key, value in metaldict.items():
if key not in taldefs.KNOWN_METAL_ATTRIBUTES:
- raise METALError("bad METAL attribute: " + `key`,
+ raise METALError("bad METAL attribute: " + repr(key),
position)
if not value:
raise TALError("missing value for METAL attribute: " +
- `key`, position)
+ repr(key), position)
for key, value in i18ndict.items():
if key not in taldefs.KNOWN_I18N_ATTRIBUTES:
- raise I18NError("bad i18n attribute: " + `key`, position)
+ raise I18NError("bad i18n attribute: " + repr(key), position)
if not value and key in ("attributes", "data", "id"):
raise I18NError("missing value for i18n attribute: " +
- `key`, position)
+ repr(key), position)
todo = {}
defineMacro = metaldict.get("define-macro")
Modified: zope.tal/trunk/src/zope/tal/talinterpreter.py
===================================================================
--- zope.tal/trunk/src/zope/tal/talinterpreter.py 2013-02-07 16:02:46 UTC (rev 129171)
+++ zope.tal/trunk/src/zope/tal/talinterpreter.py 2013-02-07 16:02:50 UTC (rev 129172)
@@ -251,7 +251,7 @@
def pushMacro(self, macroName, slots, definingName, extending):
if len(self.macroStack) >= self.stackLimit:
raise METALError("macro nesting limit (%d) exceeded "
- "by %s" % (self.stackLimit, `macroName`))
+ "by %s" % (self.stackLimit, repr(macroName)))
self.macroStack.append(
MacroStackItem((macroName, slots, definingName, extending,
True, self.i18nContext)))
@@ -865,12 +865,12 @@
else:
if not isCurrentVersion(macro):
raise METALError("macro %s has incompatible version %s" %
- (`macroName`, `getProgramVersion(macro)`),
+ (repr(macroName), repr(getProgramVersion(macro))),
self.position)
mode = getProgramMode(macro)
if mode != (self.html and "html" or "xml"):
raise METALError("macro %s has incompatible mode %s" %
- (`macroName`, `mode`), self.position)
+ (repr(macroName), repr(mode)), self.position)
self.pushMacro(macroName, compiledSlots, definingName, extending)
# We want 'macroname' name to be always available as a variable
More information about the checkins
mailing list