Exporter -> TemplateExporter / BaseExporter

IPython/nbconvert/exporters/__init__.py

@@ -1,7 +1,7 b''
 from .export import *
 from .html import HTMLExporter
 from .slides import SlidesExporter
-from .exporter import Exporter
+from .exporter import TemplateExporter
 from .latex import LatexExporter
 from .markdown import MarkdownExporter
 from .python import PythonExporter

IPython/nbconvert/exporters/baseexporter.py

@@ -1,4 +1,4 b''
-"""This module defines Exporter, a highly configurable converter
+"""This module defines BaseExporter, a highly configurable converter
 that uses Jinja2 to export notebook files into different formats.
 """
 

IPython/nbconvert/exporters/export.py

@@ -18,7 +18,7 b' from functools import wraps'
 from IPython.nbformat.v3.nbbase import NotebookNode
 from IPython.config import Config
 
-from .exporter import Exporter
+from .exporter import TemplateExporter
 from .html import HTMLExporter
 from .slides import SlidesExporter
 from .latex import LatexExporter
@@ -100,14 +100,14 b' def export(exporter, nb, **kw):'
     #Check arguments
     if exporter is None:
         raise TypeError("Exporter is None")
-    elif not isinstance(exporter, Exporter) and not issubclass(exporter, Exporter):
+    elif not isinstance(exporter, TemplateExporter) and not issubclass(exporter, TemplateExporter):
         raise TypeError("exporter does not inherit from Exporter (base)")
     if nb is None:
         raise TypeError("nb is None")
     
     #Create the exporter
     resources = kw.pop('resources', None)
-    if isinstance(exporter, Exporter):
+    if isinstance(exporter, TemplateExporter):
         exporter_instance = exporter
     else:
         exporter_instance = exporter(**kw)
@@ -122,7 +122,7 b' def export(exporter, nb, **kw):'
     return output, resources
 
 exporter_map = dict(
-    custom=Exporter,
+    custom=TemplateExporter,
     html=HTMLExporter,
     slides=SlidesExporter,
     latex=LatexExporter,

IPython/nbconvert/exporters/html.py

@@ -19,13 +19,13 b' from IPython.utils.traitlets import Unicode, List'
 from IPython.nbconvert import preprocessors
 from IPython.config import Config
 
-from .exporter import Exporter
+from .exporter import TemplateExporter
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class HTMLExporter(Exporter):
+class HTMLExporter(TemplateExporter):
     """
     Exports a basic HTML document.  This exporter assists with the export of
     HTML.  Inherit from it if you are writing your own HTML template and need

IPython/nbconvert/exporters/markdown.py

@@ -16,13 +16,13 b' Exporter that will export your ipynb to Markdown.'
 from IPython.config import Config
 from IPython.utils.traitlets import Unicode
 
-from .exporter import Exporter
+from .exporter import TemplateExporter
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class MarkdownExporter(Exporter):
+class MarkdownExporter(TemplateExporter):
     """
     Exports to a markdown document (.md)
     """

IPython/nbconvert/exporters/python.py

@@ -15,13 +15,13 b' Python exporter which exports Notebook code into a PY file.'
 
 from IPython.utils.traitlets import Unicode
 
-from .exporter import Exporter
+from .exporter import TemplateExporter
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class PythonExporter(Exporter):
+class PythonExporter(TemplateExporter):
     """
     Exports a Python code file.
     """

IPython/nbconvert/exporters/rst.py

@@ -16,13 +16,13 b' Exporter for exporting notebooks to restructured text.'
 from IPython.utils.traitlets import Unicode
 from IPython.config import Config
 
-from .exporter import Exporter
+from .exporter import TemplateExporter
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class RSTExporter(Exporter):
+class RSTExporter(TemplateExporter):
     """
     Exports restructured text documents.
     """

IPython/nbconvert/exporters/slides.py

@@ -19,13 +19,13 b' from IPython.utils.traitlets import Unicode'
 from IPython.nbconvert import preprocessors
 from IPython.config import Config
 
-from .exporter import Exporter
+from .exporter import TemplateExporter
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class SlidesExporter(Exporter):
+class SlidesExporter(TemplateExporter):
     """
     Exports slides
     """

IPython/nbconvert/nbconvertapp.py

@@ -59,7 +59,7 b' nbconvert_aliases = {}'
 nbconvert_aliases.update(base_aliases)
 nbconvert_aliases.update({
     'to' : 'NbConvertApp.export_format',
-    'template' : 'Exporter.template_file',
+    'template' : 'TemplateExporter.template_file',
     'writer' : 'NbConvertApp.writer_class',
     'post': 'NbConvertApp.postprocessor_class',
     'output': 'NbConvertApp.output_base',