Merge pull request #3507 from minrk/html

fix HTML capitalization in nbconvert exporter classes

IPython/nbconvert/exporters/__init__.py

@@ -1,7 +1,7 b''
-from .basichtml import BasicHtmlExporter
+from .basichtml import BasicHTMLExporter
 from .export import *
 from .exporter import Exporter
-from .fullhtml import FullHtmlExporter
+from .fullhtml import FullHTMLExporter
 from .latex import LatexExporter
 from .markdown import MarkdownExporter
 from .python import PythonExporter

IPython/nbconvert/exporters/basichtml.py

@@ -16,7 +16,7 b' Exporter that exports Basic HTML.'
 
 from IPython.utils.traitlets import Unicode
 
-from ..transformers.csshtmlheader import CSSHtmlHeaderTransformer
+from ..transformers.csshtmlheader import CSSHTMLHeaderTransformer
 
 from .exporter import Exporter
 
@@ -24,7 +24,7 b' from .exporter import Exporter'
 # Classes
 #-----------------------------------------------------------------------------
 
-class BasicHtmlExporter(Exporter):
+class BasicHTMLExporter(Exporter):
     """
     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
@@ -48,8 +48,8 b' class BasicHtmlExporter(Exporter):'
         """
         
         #Register the transformers of the base class.
-        super(BasicHtmlExporter, self)._register_transformers()
+        super(BasicHTMLExporter, self)._register_transformers()
         
-        #Register CSSHtmlHeaderTransformer transformer
-        self.register_transformer(CSSHtmlHeaderTransformer)
+        #Register CSSHTMLHeaderTransformer transformer
+        self.register_transformer(CSSHTMLHeaderTransformer)
                     

IPython/nbconvert/exporters/export.py

@@ -18,8 +18,8 b' from functools import wraps'
 from IPython.nbformat.v3.nbbase import NotebookNode
 
 from .exporter import Exporter
-from .basichtml import BasicHtmlExporter
-from .fullhtml import FullHtmlExporter
+from .basichtml import BasicHTMLExporter
+from .fullhtml import FullHTMLExporter
 from .latex import LatexExporter
 from .markdown import MarkdownExporter
 from .python import PythonExporter
@@ -146,7 +146,7 b' def export_basic_html(nb, config=None, transformers=None, filters=None):'
     """
     Export a notebook object to Basic HTML
     """
-    return export(BasicHtmlExporter, nb, config, transformers, filters)
+    return export(BasicHTMLExporter, nb, config, transformers, filters)
 
 
 @DocDecorator
@@ -154,7 +154,7 b' def export_full_html(nb, config=None, transformers=None, filters=None):'
     """
     Export a notebook object to Full HTML
     """
-    return export(FullHtmlExporter, nb, config, transformers, filters)
+    return export(FullHTMLExporter, nb, config, transformers, filters)
 
 
 @DocDecorator

IPython/nbconvert/exporters/fullhtml.py

@@ -16,14 +16,14 b' Exporter for exporting full HTML documents.'
 
 from IPython.utils.traitlets import Unicode
 
-from .basichtml import BasicHtmlExporter
+from .basichtml import BasicHTMLExporter
 from IPython.config import Config
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class FullHtmlExporter(BasicHtmlExporter):
+class FullHTMLExporter(BasicHTMLExporter):
     """
     Exports a full HTML document.
     """
@@ -34,6 +34,6 b' class FullHtmlExporter(BasicHtmlExporter):'
 
     @property
     def default_config(self):
-        c = Config({'CSSHtmlHeaderTransformer':{'enabled':True}})
-        c.merge(super(FullHtmlExporter,self).default_config)
+        c = Config({'CSSHTMLHeaderTransformer':{'enabled':True}})
+        c.merge(super(FullHTMLExporter,self).default_config)
         return c

IPython/nbconvert/exporters/reveal.py

@@ -16,14 +16,14 b' Reveal slide show exporter.'
 from IPython.utils.traitlets import Unicode
 from IPython.config import Config
 
-from .basichtml import BasicHtmlExporter
+from .basichtml import BasicHTMLExporter
 from IPython.nbconvert import transformers
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class RevealExporter(BasicHtmlExporter):
+class RevealExporter(BasicHTMLExporter):
     """
     Exports a Reveal slide show (.HTML) which may be rendered in a web browser.
     """
@@ -49,6 +49,6 b' class RevealExporter(BasicHtmlExporter):'
 
     @property
     def default_config(self):
-        c = Config({'CSSHtmlHeaderTransformer':{'enabled':True}})
+        c = Config({'CSSHTMLHeaderTransformer':{'enabled':True}})
         c.merge(super(RevealExporter,self).default_config)
         return c

IPython/nbconvert/transformers/csshtmlheader.py

@@ -25,7 +25,7 b' from .activatable import ActivatableTransformer'
 # Classes and functions
 #-----------------------------------------------------------------------------
 
-class CSSHtmlHeaderTransformer(ActivatableTransformer):
+class CSSHTMLHeaderTransformer(ActivatableTransformer):
     """
     Transformer used to pre-process notebook for HTML output.  Adds IPython notebook
     front-end CSS and Pygments CSS to HTML output.
@@ -45,7 +45,7 b' class CSSHtmlHeaderTransformer(ActivatableTransformer):'
             Additional arguments
         """
         
-        super(CSSHtmlHeaderTransformer, self).__init__(config=config, **kw)
+        super(CSSHTMLHeaderTransformer, self).__init__(config=config, **kw)
 
         if self.enabled :
             self._regen_header()