Merge pull request #241 from takluyver/nbconvert-config-dir

Put config_dir in resources in nbconvert handlers
jupyter · Jul 28, 2015 · 0afe9d2 · 0afe9d2
2 parents 2633494 + 7e4354f
commit 0afe9d2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/notebook/nbconvert/handlers.py b/notebook/nbconvert/handlers.py
@@ -98,7 +98,8 @@ def get(self, format, path):
                         "name": name[:name.rfind('.')],
                         "modified_date": (model['last_modified']
                             .strftime(text.date_format))
-                    }
+                    },
+                    "config_dir": self.application.settings['config_dir'],
                 }
             )
         except Exception as e:
@@ -132,7 +133,10 @@ def post(self, format):
         nbnode = from_dict(model['content'])
 
         try:
-            output, resources = exporter.from_notebook_node(nbnode)
+            output, resources = exporter.from_notebook_node(nbnode, resources={
+                "metadata": {"name": name[:name.rfind('.')],},
+                "config_dir": self.application.settings['config_dir'],
+            })
         except Exception as e:
             raise web.HTTPError(500, "nbconvert failed: %s" % e)
 

diff --git a/notebook/notebookapp.py b/notebook/notebookapp.py
@@ -207,6 +207,7 @@ def init_settings(self, ipython_app, kernel_manager, contents_manager,
             websocket_url=ipython_app.websocket_url,
             mathjax_url=ipython_app.mathjax_url,
             config=ipython_app.config,
+            config_dir=ipython_app.config_dir,
             jinja2_env=env,
             terminals_available=False,  # Set later if terminals are available
         )