Merge branch 'master' into zsh-func
This commit is contained in:
commit
265e239fc8
1 changed files with 3 additions and 3 deletions
|
@ -12,14 +12,14 @@ import sys
|
||||||
|
|
||||||
def parse_args(argv, *a, **kw):
|
def parse_args(argv, *a, **kw):
|
||||||
parser = argparse.ArgumentParser(*a, **kw)
|
parser = argparse.ArgumentParser(*a, **kw)
|
||||||
parser.add_argument('--json', action='store_true')
|
parser.add_argument('-j', '--json', action='store_const', const='js', dest='type')
|
||||||
parser.add_argument('--python', action='store_true')
|
parser.add_argument('-p', '--python', action='store_const', const='py', dest='type')
|
||||||
args = parser.parse_args(argv)
|
args = parser.parse_args(argv)
|
||||||
return args
|
return args
|
||||||
|
|
||||||
def main(argv):
|
def main(argv):
|
||||||
args = parse_args(argv[1:], prog=argv[0])
|
args = parse_args(argv[1:], prog=argv[0])
|
||||||
if args.json:
|
if not args.type or args.type == 'js':
|
||||||
print(json.dumps(json.load(sys.stdin), indent=2))
|
print(json.dumps(json.load(sys.stdin), indent=2))
|
||||||
else:
|
else:
|
||||||
pprint.pprint(eval(sys.stdin.read()))
|
pprint.pprint(eval(sys.stdin.read()))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue