Merge pull request #5187 from minrk/ensure-metadata

handle missing output metadata in nbconvert
ipython · Feb 22, 2014 · f25b06c · f25b06c
2 parents 69f1f3b + a98425e
commit f25b06c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/IPython/nbconvert/templates/html/basic.tpl b/IPython/nbconvert/templates/html/basic.tpl
@@ -120,21 +120,21 @@ unknown type  {{ cell.type }}
 
 {% block data_png %}
 <img src="data:image/png;base64,{{ output.png }}"
-{%- if 'width' in output.metadata.get('png', {}) %}
+{%- if 'metadata' in output and 'width' in output.metadata.get('png', {}) %}
 width={{output.metadata['png']['width']}}
 {%- endif %}
-{%- if 'height' in output.metadata.get('png', {}) %}
+{%- if 'metadata' in output and 'height' in output.metadata.get('png', {}) %}
 height={{output.metadata['png']['height']}}
 {%- endif %}
 >
 {%- endblock data_png %}
 
 {% block data_jpg %}
 <img src="data:image/jpeg;base64,{{ output.jpeg }}"
-{%- if 'width' in output.metadata.get('jpeg', {}) %}
+{%- if 'metadata' in output and 'width' in output.metadata.get('jpeg', {}) %}
 width={{output.metadata['jpeg']['width']}}
 {%- endif %}
-{%- if 'height' in output.metadata.get('jpeg', {}) %}
+{%- if 'metadata' in output and 'height' in output.metadata.get('jpeg', {}) %}
 height={{output.metadata['jpeg']['height']}}
 {%- endif %}
 >