##// END OF EJS Templates
Merge pull request #7446 from bollwyvl/nbconvert-pdf-title...
Min RK -
r19924:7de902aa merge
parent child Browse files
Show More
@@ -16,6 +16,7 b' from ..base.handlers import ('
16 from IPython.nbformat import from_dict
16 from IPython.nbformat import from_dict
17
17
18 from IPython.utils.py3compat import cast_bytes
18 from IPython.utils.py3compat import cast_bytes
19 from IPython.utils import text
19
20
20 def find_resource_files(output_files_dir):
21 def find_resource_files(output_files_dir):
21 files = []
22 files = []
@@ -87,9 +88,18 b' class NbconvertFileHandler(IPythonHandler):'
87 raise web.HTTPError(400, "Not a notebook: %s" % path)
88 raise web.HTTPError(400, "Not a notebook: %s" % path)
88
89
89 self.set_header('Last-Modified', model['last_modified'])
90 self.set_header('Last-Modified', model['last_modified'])
90
91
91 try:
92 try:
92 output, resources = exporter.from_notebook_node(model['content'])
93 output, resources = exporter.from_notebook_node(
94 model['content'],
95 resources={
96 "metadata": {
97 "name": name[:name.rfind('.')],
98 "modified_date": (model['last_modified']
99 .strftime(text.date_format))
100 }
101 }
102 )
93 except Exception as e:
103 except Exception as e:
94 raise web.HTTPError(500, "nbconvert failed: %s" % e)
104 raise web.HTTPError(500, "nbconvert failed: %s" % e)
95
105
@@ -241,7 +241,9 b' class Exporter(LoggingConfigurable):'
241 #Make sure the metadata extension exists in resources
241 #Make sure the metadata extension exists in resources
242 if 'metadata' in resources:
242 if 'metadata' in resources:
243 if not isinstance(resources['metadata'], ResourcesDict):
243 if not isinstance(resources['metadata'], ResourcesDict):
244 resources['metadata'] = ResourcesDict(resources['metadata'])
244 new_metadata = ResourcesDict()
245 new_metadata.update(resources['metadata'])
246 resources['metadata'] = new_metadata
245 else:
247 else:
246 resources['metadata'] = ResourcesDict()
248 resources['metadata'] = ResourcesDict()
247 if not resources['metadata']['name']:
249 if not resources['metadata']['name']:
General Comments 0
You need to be logged in to leave comments. Login now