Commit cedef143 authored by Guido van Rossum's avatar Guido van Rossum

Oops, I screwed up. I accidentally checked in Evan's tentative

changes for CancelAction with the test->tests checkin.  Undo this.

(I also screwed up my attempt to undo this silently in the RCS file --
I accidentally deleted revision 1.19 from the RCS file.
Fortunately, the log message for that revision said "Add 'nothing' to
the initial dictionary (its value is None)." and it changed only one
line, so that's no big deal.)
parent 95b78680
...@@ -92,8 +92,6 @@ import string ...@@ -92,8 +92,6 @@ import string
from TALDefs import NAME_RE, TALError, TALESError from TALDefs import NAME_RE, TALError, TALESError
CancelAction = []
class DummyEngine: class DummyEngine:
def __init__(self, macros=None): def __init__(self, macros=None):
...@@ -122,12 +120,10 @@ class DummyEngine: ...@@ -122,12 +120,10 @@ class DummyEngine:
if self.locals is self.stack[-1]: if self.locals is self.stack[-1]:
# Unmerge this scope's locals from previous scope of first set # Unmerge this scope's locals from previous scope of first set
self.locals = self.locals.copy() self.locals = self.locals.copy()
if value is not CancelAction: self.locals[name] = value
self.locals[name] = value
def setGlobal(self, name, value): def setGlobal(self, name, value):
if value is not CancelAction: self.globals[name] = value
self.globals[name] = value
def evaluate(self, expression): def evaluate(self, expression):
expression = self.uncompile(expression) expression = self.uncompile(expression)
...@@ -225,9 +221,6 @@ class DummyEngine: ...@@ -225,9 +221,6 @@ class DummyEngine:
def getTALESError(self): def getTALESError(self):
return TALESError return TALESError
def getCancelAction(self):
return CancelAction
class Iterator: class Iterator:
def __init__(self, name, seq, engine): def __init__(self, name, seq, engine):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment