Rename util.json to util.jsdump because it doesn't generate valid JSON anymore.

The JSON html builder still needs simplejson to work.

1 files changed, 19 insertions, 4 deletions

diff --git a/sphinx/builder.py b/sphinx/builder.py
index 2a1379bc7..228959548 100644
--- a/sphinx/builder.py
+++ b/sphinx/builder.py
@@ -26,7 +26,7 @@ from docutils.frontend import OptionParser
 from docutils.readers.doctree import Reader as DoctreeReader
 
 from sphinx import addnodes, locale, __version__
-from sphinx.util import ensuredir, relative_uri, SEP, os_path, json, texescape
+from sphinx.util import ensuredir, relative_uri, SEP, os_path, texescape
 from sphinx.htmlhelp import build_hhx
 from sphinx.htmlwriter import HTMLWriter, HTMLTranslator, SmartyPantsHTMLTranslator
 from sphinx.textwriter import TextWriter
@@ -36,6 +36,14 @@ from sphinx.highlighting import PygmentsBridge
 from sphinx.util.console import bold, purple, darkgreen
 from sphinx.search import js_index
 
+try:
+    import json
+except ImportError:
+    try:
+        import ssimplejson as json
+    except ImportError:
+        json = None
+
 # side effect: registers roles and directives
 from sphinx import roles
 from sphinx import directives
@@ -802,9 +810,6 @@ class SerializingHTMLBuilder(StandaloneHTMLBuilder):
         self.init_translator_class()
         self.templates = None   # no template bridge necessary
 
-    indexer_format = property(lambda x: x.implementation, doc='''
-        Alias the indexer format to the serilization implementation''')
-
     def get_target_uri(self, docname, typ=None):
         if docname == 'index':
             return ''
@@ -866,6 +871,7 @@ class PickleHTMLBuilder(SerializingHTMLBuilder):
     A Builder that dumps the generated HTML into pickle files.
     """
     implementation = pickle
+    indexer_format = pickle
     name = 'pickle'
     out_suffix = '.fpickle'
     globalcontext_filename = 'globalcontext.pickle'
@@ -877,11 +883,20 @@ class JSONHTMLBuilder(SerializingHTMLBuilder):
     A builder that dumps the generated HTML into JSON files.
     """
     implementation = json
+    indexer_format = json
     name = 'json'
     out_suffix = '.fjson'
     globalcontext_filename = 'globalcontext.json'
     searchindex_filename = 'searchindex.json'
 
+    def init(self):
+        if json is None:
+            from sphinx.application import SphinxError
+            raise SphinxError('The module simplejson (or json in Python >= 2.6) '
+                              'is not available. The JSONHTMLBuilder builder '
+                              'will not work.')
+        SerializingHTMLBuilder.init(self)
+
 
 class HTMLHelpBuilder(StandaloneHTMLBuilder):
     """