##// END OF EJS Templates
Merge pull request #73 from scopatz/master...
Bussonnier Matthias -
r8948:c38103d2 merge
parent child Browse files
Show More
@@ -30,7 +30,7 b' from types import FunctionType'
30 30 from IPython.nbformat import current as nbformat
31 31
32 32 # Our own imports
33 from converters.utils import remove_fake_files_url
33 from .utils import remove_fake_files_url
34 34
35 35
36 36 #-----------------------------------------------------------------------------
@@ -20,7 +20,7 b' platform. See the class docstring for more information.'
20 20 import io
21 21
22 22 # Our own imports
23 from converters.html import ConverterHTML
23 from .html import ConverterHTML
24 24
25 25
26 26 #-----------------------------------------------------------------------------
@@ -29,9 +29,9 b' from markdown import markdown'
29 29 from IPython.utils import path
30 30
31 31 # Our own imports
32 from converters.base import Converter
33 from converters.utils import text_cell, output_container
34 from converters.utils import highlight, coalesce_streams, ansi2html
32 from .base import Converter
33 from .utils import text_cell, output_container
34 from .utils import highlight, coalesce_streams, ansi2html
35 35
36 36
37 37 #-----------------------------------------------------------------------------
@@ -21,8 +21,8 b' import subprocess'
21 21 import sys
22 22
23 23 # Our own imports
24 from converters.base import Converter
25 from converters.utils import markdown2latex, remove_ansi
24 from .base import Converter
25 from .utils import markdown2latex, remove_ansi
26 26
27 27
28 28 #-----------------------------------------------------------------------------
@@ -16,8 +16,8 b' as a Markdown document.'
16 16 #-----------------------------------------------------------------------------
17 17
18 18 # Our own imports
19 from converters.base import Converter
20 from converters.utils import highlight, remove_ansi
19 from .base import Converter
20 from .utils import highlight, remove_ansi
21 21 from IPython.utils.text import indent
22 22
23 23
@@ -22,8 +22,8 b' import os'
22 22 from shutil import rmtree
23 23
24 24 # Our own imports
25 from converters.base import Converter
26 from converters.utils import cell_to_lines
25 from .base import Converter
26 from .utils import cell_to_lines
27 27
28 28
29 29 #-----------------------------------------------------------------------------
@@ -20,8 +20,8 b' converters that may wish to implement cell-type-specific behaviors.'
20 20 from IPython.utils.text import indent
21 21
22 22 # Our own imports
23 from converters.base import Converter
24 from converters.utils import remove_ansi
23 from .base import Converter
24 from .utils import remove_ansi
25 25
26 26
27 27 #-----------------------------------------------------------------------------
@@ -19,8 +19,8 b' reStructuredText, suitable for inclusion in e.g. Sphinx documentation.'
19 19 from IPython.utils.text import indent
20 20
21 21 # Our own imports
22 from converters.base import Converter
23 from converters.utils import markdown2rst, rst_directive, remove_ansi
22 from .base import Converter
23 from .utils import markdown2rst, rst_directive, remove_ansi
24 24
25 25
26 26 #-----------------------------------------------------------------------------
General Comments 0
You need to be logged in to leave comments. Login now