[Zope3-checkins] CVS: Zope3/src/zope/app/pagetemplate - metaconfigure.py:1.7

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/pagetemplate
In directory cvs.zope.org:/tmp/cvs-serv5868/src/zope/app/pagetemplate

Modified Files:
	metaconfigure.py 
Log Message:
Changed the test cleanup strategy which broke ftests.


=== Zope3/src/zope/app/pagetemplate/metaconfigure.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/pagetemplate/metaconfigure.py:1.6	Sat Mar  6 11:50:27 2004
+++ Zope3/src/zope/app/pagetemplate/metaconfigure.py	Tue Apr  6 16:58:14 2004
@@ -16,7 +16,7 @@
 
 $Id$
 """
-from zope.app.pagetemplate.engine import Engine
+from zope.app.pagetemplate.engine import Engine, _Engine
 from zope.testing.cleanup import addCleanUp
 
 def namespace(_context, prefix, interface):
@@ -34,10 +34,8 @@
         )
 
 
-def clearExprTypes():
-    import zope.app.pagetemplate.engine
-    from zope.app.pagetemplate.engine import _Engine
-    zope.app.pagetemplate.engine.Engine = _Engine()
+def clear():
+    Engine.__init__()
+    _Engine(Engine)
 
-addCleanUp(Engine.namespaces.clear)
-addCleanUp(clearExprTypes)
+addCleanUp(clear)