Use new license

IPython/nbconvert/exporters/notebook.py

@@ -1,36 +1,31 b''
 """IPython Notebook Exporter class"""
 
-#-----------------------------------------------------------------------------
-# Copyright (c) 2013, the IPython Development Team.
-#
+# Copyright (c) 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 .exporter import Exporter
 from IPython.nbformat import current as nbformat
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
 class NotebookExporter(Exporter):
     """
     Exports an IPython notebook.
     """
     def _file_extension_default(self):
         return 'ipynb'
 
     output_mimetype = 'application/json'
 
     def from_notebook_node(self, nb, resources=None, **kw):
         nb_copy, resources = super(NotebookExporter, self).from_notebook_node(nb, resources, **kw)
         output = nbformat.writes_json(nb_copy)
         return output, resources
 
 

IPython/nbconvert/exporters/tests/test_notebook.py

@@ -1,45 +1,40 b''
 """
 Module with tests for notebook.py
 """
 
-#-----------------------------------------------------------------------------
-# Copyright (c) 2013, the IPython Development Team.
-#
+# Copyright (c) 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 ExportersTestsBase
 from ..notebook import NotebookExporter
 
 #-----------------------------------------------------------------------------
 # Class
 #-----------------------------------------------------------------------------
 
 class TestNotebookExporter(ExportersTestsBase):
     """Contains test functions for notebook.py"""
 
     exporter_class = NotebookExporter
 
     def test_constructor(self):
         """
         Can a NotebookExporter be constructed?
         """
         NotebookExporter()
 
 
     def test_export(self):
         """
         Does the NotebookExporter return the file unchanged?
         """
         with open(self._get_notebook()) as f:
             file_contents = f.read()
         (output, resources) = NotebookExporter().from_filename(self._get_notebook())
         assert len(output) > 0
         assert output == file_contents