diff makeitso/template.py @ 88:712a6d358083

fixed output broke other things
author Jeff Hammel <jhammel@mozilla.com>
date Mon, 10 Jan 2011 19:57:13 -0800
parents d4184945f8a8
children 26b9c3bba04e
line wrap: on
line diff
--- a/makeitso/template.py	Mon Jan 10 14:39:21 2011 -0800
+++ b/makeitso/template.py	Mon Jan 10 19:57:13 2011 -0800
@@ -151,7 +151,7 @@
     def pre(self, variables):
         """do stuff before interpolation"""
 
-    def substitute(self, **variables):
+    def substitute(self, output, **variables):
         """do the substitution"""
         
         vars = self.get_variables(**variables)
@@ -160,10 +160,10 @@
 
         # do the substitution
         template = PolyTemplate(self._templates,
-                                output=self.output,
                                 interactive=self.interactive,
                                 variables=vars)
-        template.substitute()
+        template.check_output(output)
+        template.substitute(output)
                      
         self.post(vars)