more test fixed

Carreau · Carreau · commit 33ea591ab620 · 2012-10-28T19:23:29.000+01:00
diff --git a/converters/base.py b/converters/base.py
@@ -72,7 +72,7 @@ class Converter(object):
     files_dir = str()
     with_preamble = True
     user_preamble = None
-    output = str()
+    output = unicode()
     raw_as_verbatim = False
     
     def __init__(self, infile):
@@ -140,6 +140,7 @@ def render(self):
         if not hasattr(self, 'nb'):
             self.read()
         self.output = self.convert()
+        assert(type(self.output) == unicode)
         return self.save()
 
     def read(self):
diff --git a/converters/notebook.py b/converters/notebook.py
@@ -1,4 +1,5 @@
 from converters.base import Converter
+from converters.utils import cell_to_lines
 from shutil import rmtree
 import json
 
@@ -23,7 +24,7 @@ def __init__(self, infile, outbase):
         rmtree(self.files_dir)
 
     def convert(self):
-        return json.dumps(json.loads(Converter.convert(self, ',')), indent=1, sort_keys=True)
+        return unicode(json.dumps(json.loads(Converter.convert(self, ',')), indent=1, sort_keys=True))
 
     def optional_header(self):
         s = \
diff --git a/converters/utils.py b/converters/utils.py
@@ -1,8 +1,14 @@
 from __future__ import print_function
 from lexers import IPythonLexer
+
 import subprocess
+import copy
+import json
 import re
+
 from IPython.utils.text import indent
+from IPython.utils import path, py3compat
+from IPython.nbformat.v3.nbjson import BytesEncoder
 
 #-----------------------------------------------------------------------------
 # Utility functions
