Show More
@@ -14,7 +14,6 b'' | |||
|
14 | 14 | from __future__ import print_function |
|
15 | 15 | |
|
16 | 16 | # Stdlib imports |
|
17 | import sys | |
|
18 | 17 | import subprocess |
|
19 | 18 | |
|
20 | 19 | # IPython imports |
@@ -24,6 +23,15 b' from IPython.utils.py3compat import cast_bytes' | |||
|
24 | 23 | # Classes and functions |
|
25 | 24 | #----------------------------------------------------------------------------- |
|
26 | 25 | |
|
26 | class PandocMissing(SystemExit): | |
|
27 | """Exception raised when Pandoc is missing. | |
|
28 | ||
|
29 | A subclass of SystemExit so it will cause an exit if not caught, but | |
|
30 | explicitly named so that it's possible to catch. | |
|
31 | """ | |
|
32 | pass | |
|
33 | ||
|
34 | ||
|
27 | 35 | def pandoc(source, fmt, to, extra_args=None, encoding='utf-8'): |
|
28 | 36 | """Convert an input string in format `from` to format `to` via pandoc. |
|
29 | 37 | |
@@ -51,9 +59,12 b" def pandoc(source, fmt, to, extra_args=None, encoding='utf-8'):" | |||
|
51 | 59 | p = subprocess.Popen(command, |
|
52 | 60 | stdin=subprocess.PIPE, stdout=subprocess.PIPE |
|
53 | 61 | ) |
|
54 | except OSError: | |
|
55 | sys.exit("ERROR: Unable to launch pandoc. Please install pandoc:\n" | |
|
56 | "(http://johnmacfarlane.net/pandoc/installing.html)") | |
|
62 | except OSError as e: | |
|
63 | raise PandocMissing( | |
|
64 | "Error trying to run '%s': %s.\n" %(" ".join(command), e) + | |
|
65 | "Please check that pandoc is installed:\n" + | |
|
66 | "http://johnmacfarlane.net/pandoc/installing.html" | |
|
67 | ) | |
|
57 | 68 | out, _ = p.communicate(cast_bytes(source, encoding)) |
|
58 | 69 | out = out.decode(encoding, 'replace') |
|
59 | 70 | return out[:-1] |
General Comments 0
You need to be logged in to leave comments.
Login now