diff options
author | Marius Gedminas <marius@gedmin.as> | 2013-02-07 16:02:50 +0000 |
---|---|---|
committer | Marius Gedminas <marius@gedmin.as> | 2013-02-07 16:02:50 +0000 |
commit | c9d43d25af5a5419ea84fa0c1c472bc5f5c2c169 (patch) | |
tree | 43458897f3af04b35300f9119b9114eff4dd18df | |
parent | 8aca43884b33c9dcf14623fd9c9b0fcfc6dfeb3e (diff) | |
download | zope-tal-c9d43d25af5a5419ea84fa0c1c472bc5f5c2c169.tar.gz |
Towards Py3K: use repr() instead of backticks
-rw-r--r-- | src/zope/tal/dummyengine.py | 6 | ||||
-rw-r--r-- | src/zope/tal/htmltalparser.py | 4 | ||||
-rw-r--r-- | src/zope/tal/ndiff.py | 4 | ||||
-rw-r--r-- | src/zope/tal/talgenerator.py | 28 | ||||
-rw-r--r-- | src/zope/tal/talinterpreter.py | 6 |
5 files changed, 24 insertions, 24 deletions
diff --git a/src/zope/tal/dummyengine.py b/src/zope/tal/dummyengine.py index ef2d391..378502a 100644 --- a/src/zope/tal/dummyengine.py +++ b/src/zope/tal/dummyengine.py @@ -106,7 +106,7 @@ class DummyEngine(object): 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 @@ class DummyEngine(object): 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 @@ class DummyEngine(object): 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) diff --git a/src/zope/tal/htmltalparser.py b/src/zope/tal/htmltalparser.py index f81bd94..b7376c1 100644 --- a/src/zope/tal/htmltalparser.py +++ b/src/zope/tal/htmltalparser.py @@ -141,7 +141,7 @@ class HTMLTALParser(HTMLParser): = 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 @@ class HTMLTALParser(HTMLParser): 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()) diff --git a/src/zope/tal/ndiff.py b/src/zope/tal/ndiff.py index d031cdc..02294b3 100644 --- a/src/zope/tal/ndiff.py +++ b/src/zope/tal/ndiff.py @@ -512,7 +512,7 @@ def fancy_replace(a, alo, ahi, b, blo, bhi): 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 @@ def fcompare(f1name, f2name): elif tag == 'equal': dump(' ', a, alo, ahi) else: - raise ValueError('unknown tag ' + `tag`) + raise ValueError('unknown tag ' + repr(tag)) return 1 diff --git a/src/zope/tal/talgenerator.py b/src/zope/tal/talgenerator.py index 95bbea5..103f637 100644 --- a/src/zope/tal/talgenerator.py +++ b/src/zope/tal/talgenerator.py @@ -198,7 +198,7 @@ class TALGenerator(object): 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 @@ class TALGenerator(object): 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 @@ class TALGenerator(object): 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 @@ class TALGenerator(object): 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 @@ class TALGenerator(object): 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 @@ class TALGenerator(object): 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 @@ class TALGenerator(object): 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") diff --git a/src/zope/tal/talinterpreter.py b/src/zope/tal/talinterpreter.py index d98323e..0bae33d 100644 --- a/src/zope/tal/talinterpreter.py +++ b/src/zope/tal/talinterpreter.py @@ -251,7 +251,7 @@ class TALInterpreter(object): 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 @@ class TALInterpreter(object): 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 |