Fixing import for nbconvert.

IPython/nbconvert/__init__.py

@@ -1,5 +1,5 b''
 """Utilities for converting notebooks to and from different formats."""
 
 from .exporters import *
-from .filters import *
-from .transformeres import *
+import filters
+import transformers

IPython/nbconvert/exporters/basichtml.py

@@ -16,16 +16,15 b' Exporter that exports Basic HTML.'
 
 from IPython.utils.traitlets import Unicode
 
-import nbconvert.transformers.csshtmlheader
+from ..transformers.csshtmlheader import CSSHtmlHeaderTransformer
 
-# local import
-import exporter
+from .exporter import Exporter
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class BasicHtmlExporter(exporter.Exporter):
+class BasicHtmlExporter(Exporter):
     """
     Exports a basic HTML document.  This exporter assists with the export of
     HTML.  Inherit from it if you are writing your own HTML template and need
@@ -52,5 +51,5 b' class BasicHtmlExporter(exporter.Exporter):'
         super(BasicHtmlExporter, self)._register_transformers()
         
         #Register CSSHtmlHeaderTransformer transformer
-        self.register_transformer(nbconvert.transformers.csshtmlheader.CSSHtmlHeaderTransformer)
+        self.register_transformer(CSSHtmlHeaderTransformer)
                     

IPython/nbconvert/exporters/exporter.py

@@ -22,27 +22,19 b' import os'
 import inspect
 from copy import deepcopy
 
+# other libs/dependencies
+from jinja2 import Environment, FileSystemLoader
+from markdown import markdown
+
 # IPython imports
 from IPython.config.configurable import Configurable
 from IPython.config import Config
 from IPython.nbformat import current as nbformat
-from IPython.utils.traitlets import MetaHasTraits, Unicode, List, Bool
+from IPython.utils.traitlets import MetaHasTraits, Unicode
 from IPython.utils.text import indent
 
-# other libs/dependencies
-from jinja2 import Environment, FileSystemLoader
-from markdown import markdown
-
-# local import
-import nbconvert.filters.strings
-import nbconvert.filters.markdown
-import nbconvert.filters.latex
-import nbconvert.filters.datatypefilter
-import nbconvert.filters.highlight
-import nbconvert.filters.ansi
-
-import nbconvert.transformers.extractfigure
-import nbconvert.transformers.coalescestreams
+from IPython.nbconvert import filters
+from IPython.nbconvert import transformers
 
 #-----------------------------------------------------------------------------
 # Globals and constants
@@ -54,21 +46,21 b" JINJA_EXTENSIONS = ['jinja2.ext.loopcontrols']"
 default_filters = {
         'indent': indent,
         'markdown': markdown,
-        'ansi2html': nbconvert.filters.ansi.ansi2html,
-        'filter_data_type': nbconvert.filters.datatypefilter.DataTypeFilter,
-        'get_lines': nbconvert.filters.strings.get_lines,
-        'highlight': nbconvert.filters.highlight.highlight,
-        'highlight2html': nbconvert.filters.highlight.highlight,
-        'highlight2latex': nbconvert.filters.highlight.highlight2latex,
-        'markdown2latex': nbconvert.filters.markdown.markdown2latex,
-        'markdown2rst': nbconvert.filters.markdown.markdown2rst,
-        'pycomment': nbconvert.filters.strings.python_comment,
-        'rm_ansi': nbconvert.filters.ansi.remove_ansi,
-        'rm_dollars': nbconvert.filters.strings.strip_dollars,
-        'rm_fake': nbconvert.filters.strings.rm_fake,
-        'ansi2latex': nbconvert.filters.ansi.ansi2latex,
-        'rm_math_space': nbconvert.filters.latex.rm_math_space,
-        'wrap': nbconvert.filters.strings.wrap
+        'ansi2html': filters.ansi2html,
+        'filter_data_type': filters.DataTypeFilter,
+        'get_lines': filters.get_lines,
+        'highlight': filters.highlight,
+        'highlight2html': filters.highlight,
+        'highlight2latex': filters.highlight2latex,
+        'markdown2latex': filters.markdown2latex,
+        'markdown2rst': filters.markdown2rst,
+        'pycomment': filters.python_comment,
+        'rm_ansi': filters.remove_ansi,
+        'rm_dollars': filters.strip_dollars,
+        'rm_fake': filters.rm_fake,
+        'ansi2latex': filters.ansi2latex,
+        'rm_math_space': filters.rm_math_space,
+        'wrap': filters.wrap
 }
 
 #-----------------------------------------------------------------------------
@@ -280,11 +272,11 b' class Exporter(Configurable):'
         Register all of the transformers needed for this exporter.
         """
          
-        self.register_transformer(nbconvert.transformers.coalescestreams.coalesce_streams)
+        self.register_transformer(transformers.coalesce_streams)
         
         #Remember the figure extraction transformer so it can be enabled and
         #disabled easily later.
-        self.extract_figure_transformer = self.register_transformer(nbconvert.transformers.extractfigure.ExtractFigureTransformer)
+        self.extract_figure_transformer = self.register_transformer(transformers.ExtractFigureTransformer)
         
         
     def _register_filters(self):

IPython/nbconvert/exporters/fullhtml.py

@@ -16,16 +16,14 b' Exporter for exporting full HTML documents.'
 
 from IPython.utils.traitlets import Unicode
 
-# local import
-import basichtml
-
+from .basichtml import BasicHtmlExporter
 from IPython.config import Config
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class FullHtmlExporter(basichtml.BasicHtmlExporter):
+class FullHtmlExporter(BasicHtmlExporter):
     """
     Exports a full HTML document.
     """

IPython/nbconvert/exporters/latex.py

@@ -20,19 +20,14 b' tags to circumvent Jinja/Latex syntax conflicts.'
 from IPython.utils.traitlets import Unicode
 from IPython.config import Config
 
-# other libs/dependencies
-import nbconvert.filters.latex
-import nbconvert.filters.highlight
-from nbconvert.transformers.latex import LatexTransformer
-
-# local import
-import exporter
+from IPython.nbconvert import filters, transformers
+from .exporter import Exporter
 
 #-----------------------------------------------------------------------------
 # Classes and functions
 #-----------------------------------------------------------------------------
 
-class LatexExporter(exporter.Exporter):
+class LatexExporter(Exporter):
     """
     Exports to a Latex template.  Inherit from this class if your template is
     LaTeX based and you need custom tranformers/filters.  Inherit from it if 
@@ -79,8 +74,8 b' class LatexExporter(exporter.Exporter):'
         super(LatexExporter, self)._register_filters()
 
         #Add latex filters to the Jinja2 environment
-        self.register_filter('escape_tex', nbconvert.filters.latex.escape_latex) 
-        self.register_filter('highlight', nbconvert.filters.highlight.highlight2latex) 
+        self.register_filter('escape_tex', filters.escape_latex) 
+        self.register_filter('highlight', filters.highlight2latex) 
     
     
     def _register_transformers(self):
@@ -92,7 +87,7 b' class LatexExporter(exporter.Exporter):'
         super(LatexExporter, self)._register_transformers()
         
         #Register latex transformer
-        self.register_transformer(LatexTransformer)
+        self.register_transformer(transformers.LatexTransformer)
 
     @property
     def default_config(self):

IPython/nbconvert/exporters/markdown.py

@@ -15,14 +15,13 b' Exporter that will export your ipynb to Markdown.'
 
 from IPython.utils.traitlets import Unicode
 
-# local import
-import exporter
+from .exporter import Exporter
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class MarkdownExporter(exporter.Exporter):
+class MarkdownExporter(Exporter):
     """
     Exports to a markdown document (.md)
     """

IPython/nbconvert/exporters/python.py

@@ -15,14 +15,13 b' Python exporter which exports Notebook code into a PY file.'
 
 from IPython.utils.traitlets import Unicode
 
-# local import
-import exporter
+from .exporter import Exporter
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class PythonExporter(exporter.Exporter):
+class PythonExporter(Exporter):
     """
     Exports a Python code file.
     """

IPython/nbconvert/exporters/python_armor.py

@@ -16,14 +16,13 b' Exporter that exports a Python-Armor code file (.py)'
 
 from IPython.utils.traitlets import Unicode
 
-# local import
-import python
+from .python import PythonExporter
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class PythonArmorExporter(python.PythonExporter):
+class PythonArmorExporter(PythonExporter):
     """
     Exports a Python-Armor code file (.py)
     """

IPython/nbconvert/exporters/reveal.py

@@ -14,18 +14,16 b' Reveal slide show exporter.'
 #-----------------------------------------------------------------------------
 
 from IPython.utils.traitlets import Unicode
-
-# local import
-import basichtml
-
-import nbconvert.transformers.revealhelp
 from IPython.config import Config
 
+from .basichtml import BasicHtmlExporter
+from IPython.nbconvert import transformers
+
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class RevealExporter(basichtml.BasicHtmlExporter):
+class RevealExporter(BasicHtmlExporter):
     """
     Exports a Reveal slide show (.HTML) which may be rendered in a web browser.
     """
@@ -47,7 +45,7 b' class RevealExporter(basichtml.BasicHtmlExporter):'
         super(RevealExporter, self)._register_transformers()
         
         #Register reveal help transformer
-        self.register_transformer(nbconvert.transformers.revealhelp.RevealHelpTransformer)
+        self.register_transformer(transformers.RevealHelpTransformer)
 
     @property
     def default_config(self):

IPython/nbconvert/exporters/rst.py

@@ -16,14 +16,13 b' Exporter for exporting notebooks to restructured text.'
 from IPython.utils.traitlets import Unicode
 from IPython.config import Config
 
-# local import
-import exporter
+from .exporter import Exporter
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class RstExporter(exporter.Exporter):
+class RstExporter(Exporter):
     """
     Exports restructured text documents.
     """

IPython/nbconvert/exporters/sphinx_howto.py

@@ -18,15 +18,15 b' from IPython.utils.traitlets import Unicode'
 from IPython.config import Config
 
 # local import
-import latex
+from .latex import LatexExporter
 
-from nbconvert.transformers.sphinx import SphinxTransformer
+from IPython.nbconvert import transformers
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class SphinxHowtoExporter(latex.LatexExporter):
+class SphinxHowtoExporter(LatexExporter):
     """
     Exports Sphinx "HowTo" LaTeX documents.  The Sphinx "HowTo" exporter 
     produces short document format latex for use with PDFLatex.
@@ -42,7 +42,7 b' class SphinxHowtoExporter(latex.LatexExporter):'
         super(SphinxHowtoExporter, self)._register_transformers()
         
         #Register sphinx latex transformer
-        self.register_transformer(SphinxTransformer) 
+        self.register_transformer(transformers.SphinxTransformer) 
 
     @property
     def default_config(self):

IPython/nbconvert/exporters/sphinx_manual.py

@@ -16,14 +16,13 b' formatted for use with PDFLatex.'
 
 from IPython.utils.traitlets import Unicode
 
-# local import
-import sphinx_howto
+from .sphinx_howto import SphinxHowtoExporter
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
-class SphinxManualExporter(sphinx_howto.SphinxHowtoExporter):
+class SphinxManualExporter(SphinxHowtoExporter):
     """
     Exports Sphinx "Manual" LaTeX documents.  The Sphinx "Manual" exporter 
     produces book like latex output for use with PDFLatex. 

IPython/nbconvert/filters/__init__.py

@@ -1,5 +1,5 b''
 from .ansi import *
-from .datatypefilter *
+from .datatypefilter import *
 from .highlight import *
 from .latex import *
 from .markdown import *

IPython/nbconvert/filters/ansi.py

@@ -131,7 +131,6 b' def ansi2latex(text):'
     outstring = ''
     for match in color_pattern.finditer(text):
         head = text[last_end:match.start()]
-        formater = match.group()
         outstring += head
         if openbrack:
             outstring += '}'*openbrack

IPython/nbconvert/filters/highlight.py

@@ -20,7 +20,7 b' from pygments.formatters import HtmlFormatter'
 from pygments.formatters import LatexFormatter
 
 # Our own imports
-from nbconvert.utils.lexers import IPythonLexer
+from IPython.nbconvert.utils.lexers import IPythonLexer
 
 #-----------------------------------------------------------------------------
 # Globals and constants

IPython/nbconvert/filters/strings.py

@@ -14,10 +14,10 b' templates.'
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
-import re
 
 # Our own imports
 import textwrap
+
 #-----------------------------------------------------------------------------
 # Functions
 #-----------------------------------------------------------------------------

IPython/nbconvert/transformers/__init__.py

@@ -1,10 +1,9 b''
-
 # Class base Transformers
-from activatable import ActivatableTransformer
-from base import ConfigurableTransformer
-from extractfigure import ExtractFigureTransformer
-from latex import LatexTransformer
-from sphinx import SphinxTransformer
+from .activatable import ActivatableTransformer
+from .base import ConfigurableTransformer
+from .extractfigure import ExtractFigureTransformer
+from .latex import LatexTransformer
+from .sphinx import SphinxTransformer
 
 # decorated function Transformers
-from coalescestreams import coalesce_streams
+from .coalescestreams import coalesce_streams

IPython/nbconvert/transformers/base.py

@@ -16,9 +16,6 b' It exposes a convenient class to inherit from to access configurability.'
 # Imports
 #-----------------------------------------------------------------------------
 
-from __future__ import print_function, absolute_import
-
-from IPython.config.configurable import Configurable
 from ..utils.config import GlobalConfigurable
 
 #-----------------------------------------------------------------------------

IPython/nbconvert/transformers/extractfigure.py

@@ -14,7 +14,7 b" notebook file. The extracted figures are returned in the 'resources' dictionary"
 #-----------------------------------------------------------------------------
 import itertools
 
-from IPython.utils.traitlets import (Dict, List, Unicode)
+from IPython.utils.traitlets import Dict, Unicode
 from .activatable import ActivatableTransformer
 
 #-----------------------------------------------------------------------------

IPython/nbconvert/transformers/latex.py

@@ -18,7 +18,7 b' from __future__ import print_function, absolute_import'
 # Our own imports
 # Needed to override transformer
 from .activatable import (ActivatableTransformer)
-from nbconvert.filters import latex
+from IPython.nbconvert import filters
 
 #-----------------------------------------------------------------------------
 # Classes
@@ -49,5 +49,5 b' class LatexTransformer(ActivatableTransformer):'
         #if spaces exist between the ampersands and the math content.  
         #See filters.latex.rm_math_space for more information.
         if hasattr(cell, "source") and cell.cell_type == "markdown":
-            cell.source = latex.rm_math_space(cell.source)
+            cell.source = filters.rm_math_space(cell.source)
         return cell, resources

IPython/nbconvert/transformers/sphinx.py

@@ -35,7 +35,7 b' from IPython.utils.traitlets import Unicode, Bool'
 # Needed to override transformer
 from .activatable import (ActivatableTransformer) #TODO
 
-import nbconvert.utils.console  
+from IPython.nbconvert.utils import console  
 
 #-----------------------------------------------------------------------------
 # Classes and functions
@@ -147,8 +147,8 b' class SphinxTransformer(ActivatableTransformer):'
             resources["sphinx"]["outputstyle"] = self._prompt_output_style()
             
             # Small options
-            resources["sphinx"]["centeroutput"] = nbconvert.utils.console.prompt_boolean("Do you want to center the output? (false)", False)
-            resources["sphinx"]["header"] = nbconvert.utils.console.prompt_boolean("Should a Sphinx document header be used? (true)", True)
+            resources["sphinx"]["centeroutput"] = console.prompt_boolean("Do you want to center the output? (false)", False)
+            resources["sphinx"]["header"] = console.prompt_boolean("Should a Sphinx document header be used? (true)", True)
         else:
             
             # Try to use the traitlets.
@@ -194,14 +194,14 b' class SphinxTransformer(ActivatableTransformer):'
         """
         Prompt the user to input an Author name
         """
-        return  nbconvert.utils.console.input("Author name: ")
+        return  console.input("Author name: ")
     
     
     def _prompt_version(self):
         """
         prompt the user to enter a version number
         """
-        return  nbconvert.utils.console.input("Version (ie ""1.0.0""): ")
+        return  console.input("Version (ie ""1.0.0""): ")
     
     
     def _prompt_release(self):
@@ -209,7 +209,7 b' class SphinxTransformer(ActivatableTransformer):'
         Prompt the user to input a release name
         """
         
-        return  nbconvert.utils.console.input("Release Name (ie ""Rough draft""): ")
+        return  console.input("Release Name (ie ""Rough draft""): ")
     
     
     def _prompt_date(self):
@@ -218,7 +218,7 b' class SphinxTransformer(ActivatableTransformer):'
         """
         
         default_date = date.today().strftime("%B %-d, %Y")
-        user_date = nbconvert.utils.console.input("Date (deafults to \"" + default_date + "\"): ")
+        user_date = console.input("Date (deafults to \"" + default_date + "\"): ")
         if len(user_date.strip()) == 0:
             user_date = default_date
         return user_date
@@ -237,7 +237,7 b' class SphinxTransformer(ActivatableTransformer):'
         comments = {1: "(recommended for long code segments)",
                     2: "(default)"}
         
-        return nbconvert.utils.console.prompt_dictionary(styles, default_style=2, menu_comments=comments)
+        return console.prompt_dictionary(styles, default_style=2, menu_comments=comments)
     
     
     def _prompt_chapter_title_style(self):
@@ -257,5 +257,5 b' class SphinxTransformer(ActivatableTransformer):'
         comments = {1: "(default)",
                     6: "(for international documents)"}
         
-        return nbconvert.utils.console.prompt_dictionary(styles, menu_comments=comments)
+        return console.prompt_dictionary(styles, menu_comments=comments)
 

IPython/nbconvert/utils/config.py

@@ -11,7 +11,7 b''
 # Imports
 #-----------------------------------------------------------------------------
 
-from IPython.utils.traitlets import (Unicode, List, Bool)
+from IPython.utils.traitlets import List
 from IPython.config.configurable import Configurable
 
 #-----------------------------------------------------------------------------