Refactor legacy indent: int -> indent: str

The type of `indent` parameter is preferably `str`. See
http://simplejson.readthedocs.io/en/latest/index.html?highlight=dump#simplejson.dump
. This change allows to specify TABs as indentation delimiter to
`pretty_format_json`. Add input validator/converter for backward compat.
This commit is contained in:
Sander Maijers 2016-06-10 20:16:00 +02:00
parent 6f2b0a27e5
commit a5628863e8
No known key found for this signature in database
GPG key ID: 2E974A73F1B0F2F7
3 changed files with 53 additions and 3 deletions

View file

@ -24,6 +24,25 @@ def _autofix(filename, new_contents):
f.write(new_contents)
def parse_indent(s):
# type: (str) -> str
try:
int_indentation_spec = int(s)
if int_indentation_spec >= 0:
return int_indentation_spec * ' '
else:
raise ValueError(
'Negative integer supplied to construct JSON indentation delimiter. ',
)
except ValueError:
if s.strip() == '':
return s
else:
raise ValueError(
'Non-whitespace JSON indentation delimiter supplied. ',
)
def pretty_format_json(argv=None):
parser = argparse.ArgumentParser()
parser.add_argument(
@ -34,9 +53,9 @@ def pretty_format_json(argv=None):
)
parser.add_argument(
'--indent',
type=int,
default=2,
help='Number of indent spaces used to pretty-format files',
type=parse_indent,
default=' ',
help='String used as delimiter for one indentation level',
)
parser.add_argument(
'--no-sort-keys',