Merge tag 'upstream/7.8.1'

Upstream version 7.8.1

# gpg: Firmado el mar 15 nov 2016 14:18:48 ART
# gpg:                usando RSA clave A6C7B88B9583046A11C5403E0B00FB6CEBE2D002
# gpg: Firma correcta de "Ulises Vitulli <dererk@debian.org>" [absoluta]
# gpg:                 alias "Dererk <dererk@torproject.org>" [absoluta]
# gpg:                 alias "Ulises Vitulli <uvitulli@fi.uba.ar>" [absoluta]
# gpg:                 alias "Ulises Vitulli <dererk@satellogic.com>" [absoluta]

1 files changed, 42 insertions, 19 deletions

diff --git a/nikola/plugins/compile/ipynb.py b/nikola/plugins/compile/ipynb.py
index a9dedde..f3fdeea 100644
--- a/nikola/plugins/compile/ipynb.py
+++ b/nikola/plugins/compile/ipynb.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright © 2013-2015 Damián Avila, Chris Warrick and others.
+# Copyright © 2013-2016 Damián Avila, Chris Warrick and others.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated
@@ -32,28 +32,39 @@ import os
 import sys
 
 try:
-    import IPython
-    from IPython.nbconvert.exporters import HTMLExporter
-    if IPython.version_info[0] >= 3:     # API changed with 3.0.0
-        from IPython import nbformat
-        current_nbformat = nbformat.current_nbformat
-        from IPython.kernel import kernelspec
-    else:
-        import IPython.nbformat.current as nbformat
-        current_nbformat = 'json'
-        kernelspec = None
-
-    from IPython.config import Config
+    from nbconvert.exporters import HTMLExporter
+    import nbformat
+    current_nbformat = nbformat.current_nbformat
+    from jupyter_client import kernelspec
+    from traitlets.config import Config
     flag = True
+    ipy_modern = True
 except ImportError:
-    flag = None
+    try:
+        import IPython
+        from IPython.nbconvert.exporters import HTMLExporter
+        if IPython.version_info[0] >= 3:     # API changed with 3.0.0
+            from IPython import nbformat
+            current_nbformat = nbformat.current_nbformat
+            from IPython.kernel import kernelspec
+            ipy_modern = True
+        else:
+            import IPython.nbformat.current as nbformat
+            current_nbformat = 'json'
+            kernelspec = None
+            ipy_modern = False
+
+        from IPython.config import Config
+        flag = True
+    except ImportError:
+        flag = None
+        ipy_modern = None
 
 from nikola.plugin_categories import PageCompiler
 from nikola.utils import makedirs, req_missing, get_logger, STDERR_HANDLER
 
 
 class CompileIPynb(PageCompiler):
-
     """Compile IPynb into HTML."""
 
     name = "ipynb"
@@ -70,7 +81,6 @@ class CompileIPynb(PageCompiler):
         """Export notebooks as HTML strings."""
         if flag is None:
             req_missing(['ipython[notebook]>=2.0.0'], 'build this site (compile ipynb)')
-        HTMLExporter.default_template = 'basic'
         c = Config(self.site.config['IPYNB_CONFIG'])
         exportHtml = HTMLExporter(config=c)
         with io.open(source, "r", encoding="utf8") as in_file:
@@ -81,8 +91,21 @@ class CompileIPynb(PageCompiler):
     def compile_html(self, source, dest, is_two_file=True):
         """Compile source file into HTML and save as dest."""
         makedirs(os.path.dirname(dest))
+        try:
+            post = self.site.post_per_input_file[source]
+        except KeyError:
+            post = None
         with io.open(dest, "w+", encoding="utf8") as out_file:
-            out_file.write(self.compile_html_string(source, is_two_file))
+            output = self.compile_html_string(source, is_two_file)
+            output, shortcode_deps = self.site.apply_shortcodes(output, filename=source, with_dependencies=True, extra_context=dict(post=post))
+            out_file.write(output)
+        if post is None:
+            if shortcode_deps:
+                self.logger.error(
+                    "Cannot save dependencies for post {0} due to unregistered source file name",
+                    source)
+        else:
+            post._depfile[dest] += shortcode_deps
 
     def read_metadata(self, post, file_metadata_regexp=None, unslugify_titles=False, lang=None):
         """Read metadata directly from ipynb file.
@@ -119,7 +142,7 @@ class CompileIPynb(PageCompiler):
             # imported .ipynb file, guaranteed to start with "{" because it’s JSON.
             nb = nbformat.reads(content, current_nbformat)
         else:
-            if IPython.version_info[0] >= 3:
+            if ipy_modern:
                 nb = nbformat.v4.new_notebook()
                 nb["cells"] = [nbformat.v4.new_markdown_cell(content)]
             else:
@@ -152,7 +175,7 @@ class CompileIPynb(PageCompiler):
             nb["metadata"]["nikola"] = metadata
 
         with io.open(path, "w+", encoding="utf8") as fd:
-            if IPython.version_info[0] >= 3:
+            if ipy_modern:
                 nbformat.write(nb, fd, 4)
             else:
                 nbformat.write(nb, fd, 'ipynb')