openstack
/
openstack-doc-tools
Code Issues Proposed changes

Merge "jsoncheck: split process_one_file from main"

This commit is contained in:
Jenkins 2014-06-08 20:13:53 +00:00 committed by Gerrit Code Review
parent e151e6c565 c1542b1a5e
commit db87448679
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
os_doc_tools/jsoncheck.py
View File

@ -95,6 +95,21 @@ def check_format(parsed, raw, path=None):
raise FormattingException(errstr)
def process_file(path, format):
"""Check syntax/formatting and fix formatting of a JSON file."""
with open(path, 'r') as infile:
raw = infile.read()
try:
parsed = parse_json(raw)
except ParserException as err:
print("%s\n%s" % (path, err))
else:
try:
check_format(parsed, raw, path if format else None)
except FormattingException as err:
print("%s\n%s" % (path, err))
def main():
parser = argparse.ArgumentParser(description="Validate and reformat JSON"
"files.")
@ -104,19 +119,7 @@ def main():
args = parser.parse_args()
for path in args.files:
with open(path, 'r') as infile:
raw = infile.read()
infile.close()
try:
parsed = parse_json(raw)
except ParserException as err:
print("%s\n%s" % (path, err))
else:
try:
check_format(parsed, raw, path if args.format else None)
except FormattingException as err:
print("%s\n%s" % (path, err))
process_file(path, args.format)
if __name__ == "__main__":
sys.exit(main())