Changes after in person review with @ellisonbg including TODO tags

IPython/nbconvert/exporters/export.py

@@ -107,10 +107,10 def export(exporter_type, nb, **kw):
         raise TypeError("nb is None")
     
     #Create the exporter
-    exporter_instance = exporter_type(config=kw.get('config', Config()))
+    resources = kw.pop('resources', None)
+    exporter_instance = exporter_type(**kw)
 
     #Try to convert the notebook using the appropriate conversion function.
-    resources = kw.get('resources', {})
     if isinstance(nb, NotebookNode):
         output, resources = exporter_instance.from_notebook_node(nb, resources)
     elif isinstance(nb, basestring):

IPython/nbconvert/exporters/exporter.py

@@ -152,7 +152,7 class Exporter(Configurable):
         #Load user transformers.  Enabled by default.
         if self.transformers:
             for transformer in self.transformers:
-                self.register_transformer(transformer, True)
+                self.register_transformer(transformer, enabled=True)
                 
         #Load user filters.  Overwrite existing filters if need be.
         if self.filters:
@@ -178,19 +178,20 class Exporter(Configurable):
         """
         nb_copy = deepcopy(nb)
 
+        #Set output extension in resources dict
+        #TODO: init_resources
+        resources['output_extension'] = self.file_extension
+
         #Preprocess
-        nb_copy, resources = self._preprocess(nb_copy, resources)
+        nb_copy, resources = self._transform(nb_copy, resources)
 
         #Convert
         self.template = self.environment.get_template(self.template_file + self.template_extension)
         output = self.template.render(nb=nb_copy, resources=resources)
-
-        #Set output extension in resources dict
-        resources['output_extension'] = self.file_extension
         return output, resources
 
 
-    def from_filename(self, filename, resources=None **kw):
+    def from_filename(self, filename, resources=None, **kw):
         """
         Convert a notebook from a notebook file.
     
@@ -244,11 +245,9 class Exporter(Configurable):
         elif isinstance(transformer, MetaHasTraits):
             #Transformer is configurable.  Make sure to pass in new default for 
             #the enabled flag if one was specified.
-            c = Config()
-            if not enabled is None:
-                c = Config({transformer.__name__: {'enabled': enabled}})
-            c.merge(self.config)
-            transformer_instance = transformer(config=c)
+            transformer_instance = transformer(parent=self)
+            if enabled is not None:
+                transformer_instance.enabled = True
 
         else:
             #Transformer is not configurable, construct it
@@ -335,7 +334,7 class Exporter(Configurable):
             self.environment.comment_end_string = self.jinja_comment_block_end
 
 
-    def _preprocess(self, nb, resources):
+    def _transform(self, nb, resources):
         """
         Preprocess the notebook before passing it into the Jinja engine.
         To preprocess the notebook is to apply all of the 

IPython/nbconvert/exporters/latex.py

@@ -99,7 +99,7 class LatexExporter(Exporter):
     def default_config(self):
         c = Config({
             'GlobalConfigurable': {
-                'display_data_priority' : ['latex', 'png', 'jpg', 'jpeg', 'text']
+                'display_data_priority' : ['latex', 'png', 'jpg', 'pdf', 'jpeg', 'text']
                 },
              'ExtractFigureTransformer': {
                     'enabled':True

IPython/nbconvert/nbconvertapp.py

@@ -143,6 +143,7 class NbConvertApp(BaseIPythonApplication):
         super(NbConvertApp, self).start()
 
         #Export each notebook
+        #TODO: Empty check
         for notebook_filename in self.notebooks:
 
             #Get a unique key for the notebook and set it in the resources object.
@@ -153,7 +154,7 class NbConvertApp(BaseIPythonApplication):
 
             #Try to export
             try:
-                return_value = export_by_name(self.export_format,
+                output, resources = export_by_name(self.export_format,
                                               notebook_filename, 
                                               resources=resources,
                                               config=self.config)
@@ -164,8 +165,9 class NbConvertApp(BaseIPythonApplication):
                       "\n\t" + "\n\t".join(get_export_names()),
                       file=sys.stderr)
                 sys.exit(-1)
-            else:
-                output, resources = return_value 
+            except Exception as e:
+                print("Error: could no export '%s'" % notebook_filename, file=sys.stderr)
+                print(e, file=sys.stderr)
 
             #Write
             self.writer.write(output, resources, notebook_name=notebook_name)
@@ -176,4 +178,3 class NbConvertApp(BaseIPythonApplication):
 #-----------------------------------------------------------------------------
 
 launch_new_instance = NbConvertApp.launch_instance
-

IPython/nbconvert/transformers/convertfigures.py

@@ -9,6 +9,8 one format to another.
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
+#TODO: Come after extract
+
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
@@ -42,6 +44,7 class ConvertFiguresTransformer(ActivatableTransformer):
         """
         super(ConvertFiguresTransformer, self).__init__(**kw)
 
+        #TODO: Configurable, singular
         self._from_formats = from_formats
         self._to_format = to_format
 

IPython/nbconvert/transformers/convertsvg.py

@@ -69,3 +69,4 class ConvertSvgTransformer(ConvertFiguresTransformer):
                                                      #data type, so base64 encode.
             else:
                 return TypeError("Inkscape svg to png conversion failed")
+#TODO: ERROR: which notebook crashed exporter

IPython/nbconvert/transformers/extractfigure.py

@@ -18,15 +18,6 from IPython.utils.traitlets import Dict, Unicode
 from .activatable import ActivatableTransformer
 
 #-----------------------------------------------------------------------------
-# Constants
-#-----------------------------------------------------------------------------
-
-# win64 is win32 for backwards compatability, for now.  See 
-# http://mail.python.org/pipermail/patches/2000-May/000648.html
-# for the original patch that this decision was made.
-WINDOWS_PLATFORMS = ['win32']
-
-#-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
@@ -75,7 +66,7 class ExtractFigureTransformer(ActivatableTransformer):
                     #Binary files are base64-encoded, SVG is already XML
                     if out_type in ('png', 'jpg', 'pdf'):
                         data = data.decode('base64')
-                    elif sys.platform in WINDOWS_PLATFORMS:
+                    elif sys.platform == 'win32':
                         data = data.replace('\n', '\r\n').encode("UTF-8")
                     else:
                         data = data.encode("UTF-8")

IPython/nbconvert/transformers/sphinx.py

@@ -129,7 +129,7 class SphinxTransformer(ActivatableTransformer):
         #       '_draft' to signify that this needs to change.
         if not "_draft" in nb.metadata:
             nb.metadata._draft = {}
-            
+#TODO: Remove draft, and nb            
         if not "sphinx" in resources:
             resources["sphinx"] = {}