summaryrefslogtreecommitdiff
path: root/prettyson
diff options
context:
space:
mode:
Diffstat (limited to 'prettyson')
-rwxr-xr-xprettyson14
1 files changed, 11 insertions, 3 deletions
diff --git a/prettyson b/prettyson
index 367cff8..0a327ad 100755
--- a/prettyson
+++ b/prettyson
@@ -2,8 +2,16 @@
import sys, json
+def inputs(args):
+ if args:
+ for filename in args:
+ with open(filename) as f:
+ yield filename, f
+ else:
+ yield '-', sys.stdin
+
objs = []
-for filename in sys.argv[1:]:
- with open(filename) as f:
- objs.append(json.load(f))
+for filename, f in inputs(sys.argv[1:]):
+ objs.append(json.load(f))
json.dump(objs, sys.stdout, indent=4)
+sys.stdout.write('\n')