From 14b695bbb39466ccb6a8ee1442dda492c97c8ee5 2013-02-13 19:30:05
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: 2013-02-13 19:30:05
Subject: [PATCH] preprocessing and namespace fix

use preprocessing with current transform,
and ability to access notebook namespace from template

---

diff --git a/converters/template.py b/converters/template.py
index e5ae638..4dfff63 100755
--- a/converters/template.py
+++ b/converters/template.py
@@ -104,6 +104,20 @@ env.filters['markdown'] = markdown
 env.filters['highlight'] = highlight
 env.filters['ansi2html'] = ansi2html
 
+
+def haspyout_transformer(nb,_):
+    print('calling...')
+    for worksheet in nb.worksheets:
+        print('worksheet')
+        for cell in worksheet.cells:
+            cell.type = cell.cell_type
+            cell.haspyout = False
+            for out in cell.get('outputs', []):
+                if out.output_type == 'pyout':
+                    cell.haspyout = True
+                    break
+    return nb
+
 class ConverterTemplate(Configurable):
 
     display_data_priority = ['pdf', 'svg', 'png', 'jpg', 'text']
@@ -127,27 +141,17 @@ class ConverterTemplate(Configurable):
         self.template = env.get_template(tplfile+'.tpl')
         self.nb = None
         self.preprocessors = preprocessors
+        self.preprocessors.append(haspyout_transformer)
         super(ConverterTemplate, self).__init__(config=config, **kw)
 
+
     def process(self):
         nb = self.nb
 
         for preprocessor in self.preprocessors:
             nb = preprocessor(nb,{})
 
-        worksheets = []
-        for worksheet in nb.worksheets:
-            for cell in worksheet.cells:
-                cell.type = cell.cell_type
-                cell.haspyout = False
-                for out in cell.get('outputs', []):
-                    if out.output_type == 'pyout':
-                        cell.haspyout = True
-                        break
-            worksheets.append(worksheet)
-
-
-        return worksheets
+        return nb
 
     def convert(self):
         """ convert the ipynb file
@@ -155,7 +159,7 @@ class ConverterTemplate(Configurable):
         return both the converted ipynb file and a dict containing potential
         other resources
         """
-        return self.template.render(worksheets=self.process(), inlining=inlining), {}
+        return self.template.render(nb=self.process(), inlining=inlining), {}
 
 
     def read(self, filename):
diff --git a/templates/null.tpl b/templates/null.tpl
index 388debe..6107029 100644
--- a/templates/null.tpl
+++ b/templates/null.tpl
@@ -24,7 +24,7 @@ consider calling super even if block is leave block, we might insert more block 
 {%- block header -%}
 {%- endblock header -%}
 {%- block body -%}
-{%- for worksheet in worksheets -%}
+{%- for worksheet in nb.worksheets -%}
     {%- for cell in worksheet.cells -%}
         {%- block any_cell scoped -%}
             {%- if cell.type in ['code'] -%}