all seem to convert again

Carreau · Carreau · commit 66b7dfeaa008 · 2012-10-28T18:55:55.000+01:00
diff --git a/converters/bloggerhtml.py b/converters/bloggerhtml.py
@@ -1,4 +1,5 @@
-from converters.html import ConverterHTML
+from converters.html import ConverterHTML 
+import io
 
 class ConverterBloggerHTML(ConverterHTML):
     """Convert a notebook to html suitable for easy pasting into Blogger.
diff --git a/converters/html.py b/converters/html.py
@@ -1,5 +1,13 @@
+from __future__ import absolute_import
+
 from converters.base import Converter
 from converters.utils import text_cell, output_container
+from converters.utils import highlight, coalesce_streams, ansi2html
+
+from IPython.utils import path
+from markdown import markdown
+import os
+import io
 
 class ConverterHTML(Converter):
     extension = 'html'
@@ -47,7 +55,7 @@ def header_body(self):
             os.path.join(css, 'notebook.css'),
             os.path.join(css, 'renderedhtml.css'),
             # our overrides:
-            os.path.join(here, 'css', 'static_html.css'),
+            os.path.join(here, '..','css', 'static_html.css'),
         ]:
             header.extend(self._stylesheet(sheet))
         
@@ -60,7 +68,7 @@ def header_body(self):
         header.extend(self.in_tag('script', '', {'type':'"text/javascript"',
             'src': '"https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS_HTML"',
         }))
-        with io.open(os.path.join(here, 'js', 'initmathjax.js'), 
+        with io.open(os.path.join(here, '..', 'js', 'initmathjax.js'), 
                      encoding='utf-8') as f:
             header.extend(self.in_tag('script', f.read(), 
                                       {'type': '"text/javascript"'}))
diff --git a/converters/lexers.py b/converters/lexers.py
diff --git a/converters/markdown.py b/converters/markdown.py
@@ -1,4 +1,6 @@
 from converters.base import Converter
+from converters.utils import highlight, remove_ansi
+from IPython.utils.text import indent
 
 class ConverterMarkdown(Converter):
     extension = 'md'
diff --git a/converters/notebook.py b/converters/notebook.py
@@ -1,4 +1,6 @@
 from converters.base import Converter
+from shutil import rmtree
+import json
 
 class ConverterNotebook(Converter):
     """
diff --git a/converters/python.py b/converters/python.py
@@ -1,4 +1,6 @@
-from converters.base import converter
+from converters.base import Converter
+from IPython.utils.text import indent
+from converters.utils import remove_ansi
 
 class ConverterPy(Converter):
     """
diff --git a/converters/rst.py b/converters/rst.py
@@ -1,4 +1,6 @@
 from converters.base import Converter
+from converters.utils import markdown2rst, rst_directive, remove_ansi
+from IPython.utils.text import indent
 
 class ConverterRST(Converter):
     extension = 'rst'
diff --git a/converters/utils.py b/converters/utils.py
@@ -1,10 +1,26 @@
 from __future__ import print_function
+from lexers import IPythonLexer
 import subprocess
 import re
+from IPython.utils.text import indent
 
 #-----------------------------------------------------------------------------
 # Utility functions
 #-----------------------------------------------------------------------------
+def highlight(src, lang='ipython'):
+    """Return a syntax-highlighted version of the input source.
+    """
+    from pygments import highlight
+    from pygments.lexers import get_lexer_by_name
+    from pygments.formatters import HtmlFormatter
+    
+    if lang == 'ipython':
+        lexer = IPythonLexer()
+    else:
+        lexer = get_lexer_by_name(lang, stripall=True)
+        
+    return highlight(src, lexer, HtmlFormatter())
+
 def output_container(f):
     """add a prompt-area next to an output"""
     def wrapped(self, output):
diff --git a/nbconvert.py b/nbconvert.py
@@ -42,6 +42,8 @@
 from converters.bloggerhtml import ConverterBloggerHTML
 from converters.rst import ConverterRST
 from converters.latex import ConverterLaTeX
+from converters.notebook import ConverterNotebook
+from converters.python import ConverterPy
 
 known_formats = "rst (default), html, blogger-html, latex, markdown, py"
 
