Revert 124660 - Allow comments in extension config files.

tools/json_schema_compiler/previewserver.py

 #!/usr/bin/env python
 
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """Server for viewing the compiled C++ code from tools/json_schema_compiler.
 """
 
 import cc_generator
 import code
 import cpp_type_generator
 import cpp_util
 import h_generator
-from json_schema import LoadJSON
+import json
 import model
 import optparse
 import os
 import sys
 import urlparse
 from highlighters import (
     pygments_highlighter, none_highlighter, hilite_me_highlighter)
 from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
 
 class CompilerHandler(BaseHTTPRequestHandler):
@@ skipping 156 matching lines @@
 
     api_model = model.Model()
 
     request_path = self._GetRequestPath(parsed_url)
     (file_root, file_ext) = os.path.splitext(request_path)
     (filedir, filename) = os.path.split(file_root)
     json_file_path = os.path.normpath(file_root + '.json')
 
     try:
       # Get main json file
-      api_defs = LoadJSON(json_file_path)
+      with open(json_file_path) as json_file:
+        api_defs = json.loads(json_file.read())
       namespace = api_model.AddNamespace(api_defs[0], json_file_path)
       if not namespace:
         body.Append("<pre>Target file %s is marked nocompile</pre>" %
             json_file_path)
         return
       type_generator = cpp_type_generator.CppTypeGenerator(
          'preview::api', namespace, namespace.unix_name)
 
       # Get json file depedencies
       for dependency in api_defs[0].get('dependencies', []):
         json_file_path = os.path.join(filedir, dependency + '.json')
-        api_defs = LoadJSON(json_file_path)
+        with open(json_file_path) as json_file:
+          api_defs = json.loads(json_file.read())
         referenced_namespace = api_model.AddNamespace(api_defs[0],
             json_file_path)
         if referenced_namespace:
           type_generator.AddNamespace(referenced_namespace,
               cpp_util.Classname(referenced_namespace.name).lower())
 
       # Generate code
       if file_ext == '.h':
         cpp_code = (h_generator.HGenerator(namespace, type_generator)
             .Generate().Render())
@@ skipping 113 matching lines @@
     print('')
     server = PreviewHTTPServer(('', int(opts.port)), CompilerHandler,
       {
         'pygments': pygments_highlighter.PygmentsHighlighter(),
         'hilite': hilite_me_highlighter.HiliteMeHighlighter(),
         'none': none_highlighter.NoneHighlighter(),
       })
     server.serve_forever()
   except KeyboardInterrupt:
     server.socket.close()