Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4732)

Unified Diff: chrome/common/extensions/docs/build/directory.py

Issue 9582013: Revert 124660 - Allow comments in extension config files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/extensions/api/windows.json ('k') | chrome/common/extensions/docs/js/api_page_generator.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/docs/build/directory.py
===================================================================
--- chrome/common/extensions/docs/build/directory.py (revision 124674)
+++ chrome/common/extensions/docs/build/directory.py (working copy)
@@ -12,7 +12,6 @@
import hashlib
import zipfile
import simplejson as json
-import json_minify as minify
# Make sure we get consistent string sorting behavior by explicitly using the
# default C locale.
@@ -49,8 +48,7 @@
raise Exception("Failed to read the file at %s: %s" % (path, msg))
try:
- json_str = json_file.read()
- json_obj = json.loads(minify.json_minify(json_str), encoding)
+ json_obj = json.load(json_file, encoding)
except ValueError, msg:
raise Exception("Failed to parse JSON out of file %s: %s" % (path, msg))
finally:
« no previous file with comments | « chrome/common/extensions/api/windows.json ('k') | chrome/common/extensions/docs/js/api_page_generator.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698