diff options
author | Lars Wirzenius <liw@liw.fi> | 2016-07-11 12:18:26 +0300 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2016-07-11 12:18:26 +0300 |
commit | fd910f859e0adbcbc7b0f9fa5ec314f5ddd305ae (patch) | |
tree | 758e3b47d845187c7f152820f0beeff8c5d83f70 | |
parent | 5829355e52df21bd2fd1d741dfd4d1deafa98f85 (diff) | |
download | extrautils-fd910f859e0adbcbc7b0f9fa5ec314f5ddd305ae.tar.gz |
Make pretty* read from stdin by default
-rw-r--r-- | NEWS | 1 | ||||
-rwxr-xr-x | prettyml | 13 | ||||
-rwxr-xr-x | prettyson | 14 |
3 files changed, 22 insertions, 6 deletions
@@ -9,6 +9,7 @@ I'll assume I'm the only user. Version 1.20160502+git, not yet released ---------------------------------------- +* prettyson and prettyml now read from stdin by default. Version 1.20160502, released 2016-05-02 ---------------------------------------- @@ -4,8 +4,15 @@ import sys import yaml +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(yaml.safe_load(f)) +for filename, f in inputs(sys.argv[1:]): + objs.append(yaml.safe_load(f)) yaml.safe_dump_all(objs, stream=sys.stdout, indent=4, default_flow_style=False) @@ -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') |