##// END OF EJS Templates
Also catch SyntaxErrors from InputTransformers in run_cell()...
Also catch SyntaxErrors from InputTransformers in run_cell() The run_cell() method is not used in the IPython terminal, so there are two code paths where the SyntaxError needs to be caught. Also, this commit moves the terminal test to IPython/terminal/test/ instead of IPython/app/test. I've checked that this works in the terminal, the Qt console, and the html notebook.

File last commit:

r13427:e5ec1d8f
r13525:b06d9d6e
Show More
svg2pdf.py
95 lines | 3.5 KiB | text/x-python | PythonLexer
Paul Ivanov
replace 'transformer' with 'preprocessor'
r12219 """Module containing a preprocessor that converts outputs in the notebook from
Jonathan Frederic
Added writers and supporting code.
r11367 one format to another.
"""
#-----------------------------------------------------------------------------
# Copyright (c) 2013, the IPython Development Team.
#
# Distributed under the terms of the Modified BSD License.
#
# The full license is in the file COPYING.txt, distributed with this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
MinRK
make inkscape command configurable...
r11571 import base64
MinRK
fix unicode file-writing in svg2pdf
r11578 import io
Jonathan Frederic
Added writers and supporting code.
r11367 import os
Jonathan Frederic
Missing imports
r11385 import sys
import subprocess
Jonathan Frederic
Added writers and supporting code.
r11367 from IPython.utils.tempdir import TemporaryDirectory
Jonathan Frederic
To and from formats configurable
r11386 from IPython.utils.traitlets import Unicode
Jonathan Frederic
Added writers and supporting code.
r11367
Paul Ivanov
replace 'transformer' with 'preprocessor'
r12219 from .convertfigures import ConvertFiguresPreprocessor
Jonathan Frederic
Added writers and supporting code.
r11367
#-----------------------------------------------------------------------------
# Constants
#-----------------------------------------------------------------------------
MinRK
tweak inkscape configurability...
r11580 INKSCAPE_APP = '/Applications/Inkscape.app/Contents/Resources/bin/inkscape'
Jonathan Frederic
Added writers and supporting code.
r11367
#-----------------------------------------------------------------------------
# Classes
#-----------------------------------------------------------------------------
Paul Ivanov
replace 'transformer' with 'preprocessor'
r12219 class SVG2PDFPreprocessor(ConvertFiguresPreprocessor):
Jonathan Frederic
Added writers and supporting code.
r11367 """
MinRK
make inkscape command configurable...
r11571 Converts all of the outputs in a notebook from SVG to PDF.
Jonathan Frederic
Added writers and supporting code.
r11367 """
Jonathan Frederic
To and from formats configurable
r11386 from_format = Unicode('svg', config=True, help='Format the converter accepts')
to_format = Unicode('pdf', config=False, help='Format the converter writes')
MinRK
tweak inkscape configurability...
r11580
MinRK
make inkscape command configurable...
r11571 command = Unicode(config=True,
help="""The command to use for converting SVG to PDF
This string is a template, which will be formatted with the keys
to_filename and from_filename.
The conversion call must read the SVG from {from_flename},
and write a PDF to {to_filename}.
""")
def _command_default(self):
MinRK
tweak inkscape configurability...
r11580 return self.inkscape + \
' --without-gui --export-pdf="{to_filename}" "{from_filename}"'
inkscape = Unicode(config=True, help="The path to Inkscape, if necessary")
def _inkscape_default(self):
MinRK
make inkscape command configurable...
r11571 if sys.platform == "darwin":
MinRK
tweak inkscape configurability...
r11580 if os.path.isfile(INKSCAPE_APP):
return INKSCAPE_APP
return "inkscape"
Jonathan Frederic
Added writers and supporting code.
r11367
def convert_figure(self, data_format, data):
"""
MinRK
make inkscape command configurable...
r11571 Convert a single SVG figure to PDF. Returns converted data.
Jonathan Frederic
Added writers and supporting code.
r11367 """
#Work in a temporary directory
with TemporaryDirectory() as tmpdir:
#Write fig to temp file
input_filename = os.path.join(tmpdir, 'figure.' + data_format)
MinRK
fix unicode file-writing in svg2pdf
r11578 # SVG data is unicode text
with io.open(input_filename, 'w', encoding='utf8') as f:
Jonathan Frederic
Added writers and supporting code.
r11367 f.write(data)
#Call conversion application
output_filename = os.path.join(tmpdir, 'figure.pdf')
MinRK
make inkscape command configurable...
r11571 shell = self.command.format(from_filename=input_filename,
Jonathan Frederic
Mac OSX support for svg converter
r11384 to_filename=output_filename)
Jonathan Frederic
Added writers and supporting code.
r11367 subprocess.call(shell, shell=True) #Shell=True okay since input is trusted.
#Read output from drive
MinRK
make inkscape command configurable...
r11571 # return value expects a filename
Jonathan Frederic
Added writers and supporting code.
r11367 if os.path.isfile(output_filename):
Jonathan Frederic
base64 encode PDF before writing back to the nb structure
r11374 with open(output_filename, 'rb') as f:
MinRK
make inkscape command configurable...
r11571 # PDF is a nb supported binary, data type, so base64 encode.
return base64.encodestring(f.read())
Jonathan Frederic
Added writers and supporting code.
r11367 else:
Jakob Gager
Correct TypeError message in svg2pdf
r13427 raise TypeError("Inkscape svg to pdf conversion failed")