From c38103d28fe2a1db6a9f81af1f1ad59206c336da 2012-12-29 19:00:30 From: Bussonnier Matthias Date: 2012-12-29 19:00:30 Subject: [PATCH] Merge pull request #73 from scopatz/master Updated to relative imports in converters sub-package --- diff --git a/converters/base.py b/converters/base.py index ab66ed2..2bf4dce 100755 --- a/converters/base.py +++ b/converters/base.py @@ -30,7 +30,7 @@ from types import FunctionType from IPython.nbformat import current as nbformat # Our own imports -from converters.utils import remove_fake_files_url +from .utils import remove_fake_files_url #----------------------------------------------------------------------------- diff --git a/converters/bloggerhtml.py b/converters/bloggerhtml.py index 82d498a..583c60e 100755 --- a/converters/bloggerhtml.py +++ b/converters/bloggerhtml.py @@ -20,7 +20,7 @@ platform. See the class docstring for more information. import io # Our own imports -from converters.html import ConverterHTML +from .html import ConverterHTML #----------------------------------------------------------------------------- diff --git a/converters/html.py b/converters/html.py index 081170e..c4158f7 100755 --- a/converters/html.py +++ b/converters/html.py @@ -29,9 +29,9 @@ from markdown import markdown from IPython.utils import path # Our own imports -from converters.base import Converter -from converters.utils import text_cell, output_container -from converters.utils import highlight, coalesce_streams, ansi2html +from .base import Converter +from .utils import text_cell, output_container +from .utils import highlight, coalesce_streams, ansi2html #----------------------------------------------------------------------------- diff --git a/converters/latex.py b/converters/latex.py index edf5448..8361763 100755 --- a/converters/latex.py +++ b/converters/latex.py @@ -21,8 +21,8 @@ import subprocess import sys # Our own imports -from converters.base import Converter -from converters.utils import markdown2latex, remove_ansi +from .base import Converter +from .utils import markdown2latex, remove_ansi #----------------------------------------------------------------------------- diff --git a/converters/markdown.py b/converters/markdown.py index 1887a6c..358c6dc 100755 --- a/converters/markdown.py +++ b/converters/markdown.py @@ -16,8 +16,8 @@ as a Markdown document. #----------------------------------------------------------------------------- # Our own imports -from converters.base import Converter -from converters.utils import highlight, remove_ansi +from .base import Converter +from .utils import highlight, remove_ansi from IPython.utils.text import indent diff --git a/converters/notebook.py b/converters/notebook.py index f4200ec..c4e970a 100755 --- a/converters/notebook.py +++ b/converters/notebook.py @@ -22,8 +22,8 @@ import os from shutil import rmtree # Our own imports -from converters.base import Converter -from converters.utils import cell_to_lines +from .base import Converter +from .utils import cell_to_lines #----------------------------------------------------------------------------- diff --git a/converters/python.py b/converters/python.py index d7905fb..88975c8 100755 --- a/converters/python.py +++ b/converters/python.py @@ -20,8 +20,8 @@ converters that may wish to implement cell-type-specific behaviors. from IPython.utils.text import indent # Our own imports -from converters.base import Converter -from converters.utils import remove_ansi +from .base import Converter +from .utils import remove_ansi #----------------------------------------------------------------------------- diff --git a/converters/rst.py b/converters/rst.py index 4ef54aa..bf0169c 100755 --- a/converters/rst.py +++ b/converters/rst.py @@ -19,8 +19,8 @@ reStructuredText, suitable for inclusion in e.g. Sphinx documentation. from IPython.utils.text import indent # Our own imports -from converters.base import Converter -from converters.utils import markdown2rst, rst_directive, remove_ansi +from .base import Converter +from .utils import markdown2rst, rst_directive, remove_ansi #-----------------------------------------------------------------------------