Use language_info instead of kernelspec in nbconvert

IPython/nbconvert/exporters/html.py

@@ -59,8 +59,8 b' class HTMLExporter(TemplateExporter):'
         return c
 
     def from_notebook_node(self, nb, resources=None, **kw):
-        kernelspec = nb.metadata.get('kernelspec', {})
-        lexer = kernelspec.get('pygments_lexer', kernelspec.get('language', None))
+        langinfo = nb.metadata.get('language_info', {})
+        lexer = langinfo.get('pygments_lexer', langinfo.get('name', None))
         self.register_filter('highlight_code',
                              Highlight2HTML(pygments_lexer=lexer, parent=self))
         return super(HTMLExporter, self).from_notebook_node(nb, resources, **kw)

IPython/nbconvert/exporters/latex.py

@@ -89,8 +89,8 b' class LatexExporter(TemplateExporter):'
         return c
 
     def from_notebook_node(self, nb, resources=None, **kw):
-        kernelspec = nb.metadata.get('kernelspec', {})
-        lexer = kernelspec.get('pygments_lexer', kernelspec.get('language', None))
+        langinfo = nb.metadata.get('language_info', {})
+        lexer = langinfo.get('pygments_lexer', langinfo.get('name', None))
         self.register_filter('highlight_code',
                              Highlight2Latex(pygments_lexer=lexer, parent=self))
         return super(LatexExporter, self).from_notebook_node(nb, resources, **kw)

IPython/nbconvert/filters/highlight.py

@@ -27,7 +27,7 b' class Highlight2HTML(NbConvertBase):'
 
     def _default_language_changed(self, name, old, new):
         warn('Setting default_language in config is deprecated, '
-             'please use kernelspecs instead.')
+             'please use language_info metadata instead.')
         self.pygments_lexer = new
 
     def __call__(self, source, language=None, metadata=None):
@@ -61,7 +61,7 b' class Highlight2Latex(NbConvertBase):'
 
     def _default_language_changed(self, name, old, new):
         warn('Setting default_language in config is deprecated, '
-             'please use kernelspecs instead.')
+             'please use language_info metadata instead.')
         self.pygments_lexer = new
 
     def __call__(self, source, language=None, metadata=None, strip_verbatim=False):

IPython/nbconvert/utils/base.py

@@ -35,7 +35,7 b' class NbConvertBase(LoggingConfigurable):'
             )
 
     default_language = Unicode('ipython', config=True,
-       help='DEPRECATED default highlight language, please use kernelspecs instead')
+       help='DEPRECATED default highlight language, please use language_info metadata instead')
 
     def __init__(self, **kw):
         super(NbConvertBase, self).__init__(**kw)