Merge pull request ipython#5308 from minrk/HTML

fix HTML capitalization in Highlight2HTML
mattvonrocketstein · Mar 10, 2014 · 7b937a3 · 7b937a3
2 parents 092adfd + 97ba0bf
commit 7b937a3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/IPython/nbconvert/exporters/templateexporter.py b/IPython/nbconvert/exporters/templateexporter.py
@@ -44,7 +44,7 @@
         'ansi2html': filters.ansi2html,
         'filter_data_type': filters.DataTypeFilter,
         'get_lines': filters.get_lines,
-        'highlight2html': filters.Highlight2Html,
+        'highlight2html': filters.Highlight2HTML,
         'highlight2latex': filters.Highlight2Latex,
         'ipython2python': filters.ipython2python,
         'posix_path': filters.posix_path,

diff --git a/IPython/nbconvert/filters/highlight.py b/IPython/nbconvert/filters/highlight.py
@@ -32,12 +32,12 @@
 #-----------------------------------------------------------------------------
 
 __all__ = [
-    'Highlight2Html',
+    'Highlight2HTML',
     'Highlight2Latex'
 ]
 
 
-class Highlight2Html(NbConvertBase):
+class Highlight2HTML(NbConvertBase):
 
     def __call__(self, source, language=None, metadata=None):
         """

diff --git a/IPython/nbconvert/filters/tests/test_highlight.py b/IPython/nbconvert/filters/tests/test_highlight.py
@@ -15,19 +15,19 @@
 #-----------------------------------------------------------------------------
 
 from ...tests.base import TestsBase
-from ..highlight import Highlight2Html, Highlight2Latex
+from ..highlight import Highlight2HTML, Highlight2Latex
 from IPython.config import Config
 import xml
 
 #-----------------------------------------------------------------------------
 # Class
 #-----------------------------------------------------------------------------
 
-highlight2html = Highlight2Html()
+highlight2html = Highlight2HTML()
 highlight2latex = Highlight2Latex()
 c = Config()
-c.Highlight2Html.default_language='ruby'
-highlight2html_ruby = Highlight2Html(config=c)
+c.Highlight2HTML.default_language='ruby'
+highlight2html_ruby = Highlight2HTML(config=c)
 
 class TestHighlight(TestsBase):
     """Contains test functions for highlight.py"""