Fix eafc8cb070: highlight tests should now pass a cell object

IPython/nbconvert/filters/highlight.py

@@ -1,98 +1,98
 """
 Module containing filter functions that allow code to be highlighted
 from within Jinja templates.
 """
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 
 import re
 
 from pygments import highlight as pygements_highlight
 from pygments.lexers import get_lexer_by_name
 from pygments.formatters import HtmlFormatter
 from pygments.formatters import LatexFormatter
 
 # Our own imports
 from IPython.nbconvert.utils.lexers import IPythonLexer
 
 #-----------------------------------------------------------------------------
 # Globals and constants
 #-----------------------------------------------------------------------------
 
 MULTILINE_OUTPUTS = ['text', 'html', 'svg', 'latex', 'javascript', 'json']
 
 #-----------------------------------------------------------------------------
 # Utility functions
 #-----------------------------------------------------------------------------
 
 __all__ = [
     'highlight2html',
     'highlight2latex'
 ]
 
 def highlight2html(cell, language='ipython'):
     """
     Return a syntax-highlighted version of the input source as html output.
 
     Parameters
     ----------
     cell : NotebookNode cell
         cell to highlight
     language : str
         Language to highlight the syntax of.
     """
 
     return _pygment_highlight(cell, HtmlFormatter(), language)
 
 
 def highlight2latex(cell, language='ipython'):
     """
     Return a syntax-highlighted version of the input source as latex output.
 
     Parameters
     ----------
     cell : NotebookNode cell
         cell to highlight
     language : str
         Language to highlight the syntax of.
     """
     return _pygment_highlight(cell, LatexFormatter(), language)
 
 
 
 def _pygment_highlight(cell, output_formatter, language='ipython'):
     """
     Return a syntax-highlighted version of the input source
 
     Parameters
     ----------
     cell : NotebookNode cell
         cell to highlight
     output_formatter : Pygments formatter
     language : str
         Language to highlight the syntax of.
     """
 
     # If the cell uses a magic extension language,
     # use the magic language instead.
     if language == 'ipython' \
         and 'metadata' in cell \
         and 'magics_language' in cell['metadata']:
 
         language = cell['metadata']['magics_language']
 
     if language == 'ipython':
         lexer = IPythonLexer()
     else:
         lexer = get_lexer_by_name(language, stripall=True)
 
-    return pygements_highlight(cell, lexer, output_formatter)
+    return pygements_highlight(cell['input'], lexer, output_formatter)

IPython/nbconvert/filters/tests/test_highlight.py

@@ -1,65 +1,65
 """
 Module with tests for Highlight
 """
 
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 
 from ...tests.base import TestsBase
 from ..highlight import highlight2html, highlight2latex
 
 
 #-----------------------------------------------------------------------------
 # Class
 #-----------------------------------------------------------------------------
 
 class TestHighlight(TestsBase):
     """Contains test functions for highlight.py"""
 
     #Hello world test, magics test, blank string test
     tests = [
         """
         #Hello World Example
 
         def say(text):
             print(text)
 
         say('Hello World!')
         """,
         """
         %%pylab
         plot(x,y, 'r')
         """
         ]   
 
     tokens = [
         ['Hello World Example', 'say', 'text', 'print', 'def'],
         ['pylab', 'plot']]
 
 
     def test_highlight2html(self):
         """highlight2html test"""
         for index, test in enumerate(self.tests):
             self._try_highlight(highlight2html, test, self.tokens[index])
 
 
     def test_highlight2latex(self):
         """highlight2latex test"""
         for index, test in enumerate(self.tests):
             self._try_highlight(highlight2latex, test, self.tokens[index])
 
 
     def _try_highlight(self, method, test, tokens):
         """Try highlighting source, look for key tokens"""
-        results = method(test)
+        results = method({'input': test})
         for token in tokens:
             assert token in results