Renamed remaining `figures` strings

IPython/nbconvert/exporters/tests/test_exporter.py

@@ -1,113 +1,113 b''
 """
 Module with tests for exporter.py
 """
 
 #-----------------------------------------------------------------------------
 # 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 IPython.config import Config
 
 from .base import ExportersTestsBase
 from .cheese import CheeseTransformer
 from ..exporter import Exporter
 
 
 #-----------------------------------------------------------------------------
 # Class
 #-----------------------------------------------------------------------------
 
 class TestExporter(ExportersTestsBase):
     """Contains test functions for exporter.py"""
 
 
     def test_constructor(self):
         """
         Can an Exporter be constructed?
         """
         Exporter()
 
 
     def test_export(self):
         """
         Can an Exporter export something?
         """
         exporter = self._make_exporter()
         (output, resources) = exporter.from_filename(self._get_notebook())
         assert len(output) > 0
 
 
-    def test_extract_figures(self):
+    def test_extract_outputs(self):
         """
-        If the ExtractOutputTransformer is enabled, are figures extracted?
+        If the ExtractOutputTransformer is enabled, are outputs extracted?
         """
         config = Config({'ExtractOutputTransformer': {'enabled': True}})
         exporter = self._make_exporter(config=config)
         (output, resources) = exporter.from_filename(self._get_notebook())
         assert resources is not None
-        assert 'figures' in resources
-        assert len(resources['figures']) > 0
+        assert 'outputs' in resources
+        assert len(resources['outputs']) > 0
 
 
     def test_transformer_class(self):
         """
         Can a transformer be added to the transformers list by class type?
         """
         config = Config({'Exporter': {'transformers': [CheeseTransformer]}})
         exporter = self._make_exporter(config=config)
         (output, resources) = exporter.from_filename(self._get_notebook())
         assert resources is not None
         assert 'cheese' in resources
         assert resources['cheese'] == 'real'
 
 
     def test_transformer_instance(self):
         """
         Can a transformer be added to the transformers list by instance?
         """
         config = Config({'Exporter': {'transformers': [CheeseTransformer()]}})
         exporter = self._make_exporter(config=config)
         (output, resources) = exporter.from_filename(self._get_notebook())
         assert resources is not None
         assert 'cheese' in resources
         assert resources['cheese'] == 'real'
 
 
     def test_transformer_dottedobjectname(self):
         """
         Can a transformer be added to the transformers list by dotted object name?
         """
         config = Config({'Exporter': {'transformers': ['IPython.nbconvert.exporters.tests.cheese.CheeseTransformer']}})
         exporter = self._make_exporter(config=config)
         (output, resources) = exporter.from_filename(self._get_notebook())
         assert resources is not None
         assert 'cheese' in resources
         assert resources['cheese'] == 'real'
 
 
     def test_transformer_via_method(self):
         """
         Can a transformer be added via the Exporter convinience method?
         """
         exporter = self._make_exporter()
         exporter.register_transformer(CheeseTransformer, enabled=True)
         (output, resources) = exporter.from_filename(self._get_notebook())
         assert resources is not None
         assert 'cheese' in resources
         assert resources['cheese'] == 'real'
 
 
     def _make_exporter(self, config=None):
         #Create the exporter instance, make sure to set a template name since
         #the base Exporter doesn't have a template associated with it.
         exporter = Exporter(config=config)
         exporter.template_file = 'python'
         return exporter        
  No newline at end of file

IPython/nbconvert/transformers/convertfigures.py

@@ -1,64 +1,64 b''
 """Module containing a transformer that converts outputs in the notebook from 
 one format to another.
 """
 #-----------------------------------------------------------------------------
 # 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 .base import Transformer
 from IPython.utils.traitlets import Unicode
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
 class ConvertFiguresTransformer(Transformer):
     """
     Converts all of the outputs in a notebook from one format to another.
     """
 
     from_format = Unicode(config=True, help='Format the converter accepts')
     to_format = Unicode(config=True, help='Format the converter writes')
 
     def __init__(self, **kw):
         """
         Public constructor
         """
         super(ConvertFiguresTransformer, self).__init__(**kw)
 
 
     def convert_figure(self, data_format, data):
         raise NotImplementedError()
 
 
     def transform_cell(self, cell, resources, cell_index):
         """
         Apply a transformation on each cell,
         
         See base.py
         """
 
         #Loop through all of the datatypes of the outputs in the cell.
         for index, cell_out in enumerate(cell.get('outputs', [])):
             for data_type, data in cell_out.items():
-                # this must run *before* extract figures,
+                # this must run *before* extract outputs,
                 # so figure_name and filename do not exist
                 self._convert_figure(cell_out, resources, data_type, data)
         return cell, resources
 
 
     def _convert_figure(self, cell_out, resources, data_type, data):
         """
         Convert a figure and output the results to the cell output
         """
         if not self.to_format in cell_out and data_type == self.from_format:
             data = self.convert_figure(data_type, data)
             cell_out[self.to_format] = data