[ZPT] CVS: Packages/TAL - DummyEngine.py:1.21

[guido@digicool.com]

Update of /cvs-repository/Packages/TAL
In directory korak:/tmp/cvs-serv30421

Modified Files:
	DummyEngine.py 
Log Message:
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.)



--- Updated File DummyEngine.py in package Packages/TAL --
--- DummyEngine.py	2001/04/27 17:25:04	1.20
+++ DummyEngine.py	2001/04/27 17:36:11	1.21
@@ -92,8 +92,6 @@
 
 from TALDefs import NAME_RE, TALError, TALESError
 
-CancelAction = []
-
 class DummyEngine:
 
     def __init__(self, macros=None):
@@ -122,12 +120,10 @@
         if self.locals is self.stack[-1]:
             # Unmerge this scope's locals from previous scope of first set
             self.locals = self.locals.copy()
-        if value is not CancelAction:
-            self.locals[name] = value
+        self.locals[name] = value
 
     def setGlobal(self, name, value):
-        if value is not CancelAction:
-            self.globals[name] = value
+        self.globals[name] = value
 
     def evaluate(self, expression):
         expression = self.uncompile(expression)
@@ -224,9 +220,6 @@
 
     def getTALESError(self):
         return TALESError
-
-    def getCancelAction(self):
-        return CancelAction
 
 class Iterator: