Skip to content

Commit 20b52f1

Browse files
committed
configure pretty printer
- increase indent and line width - print dictionaries with keys in insertion order
1 parent 6e86578 commit 20b52f1

File tree

1 file changed

+17
-13
lines changed

1 file changed

+17
-13
lines changed

src/w90io/__main__.py

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
import w90io
66

77

8+
pp = pprint.PrettyPrinter(indent=2, width=120)
9+
pprint.sorted = lambda x, key=None: x # print dictionaries with keys in insertion order
10+
11+
812
def parse_win(args):
913
contents = args.file.read()
1014

@@ -13,44 +17,44 @@ def parse_win(args):
1317
blocks = w90io._core.extract_blocks(contents)
1418

1519
if args.extract_only:
16-
pprint.pprint({
20+
pp.pprint({
1721
'comments': comments,
1822
'parameters': parameters,
1923
'blocks': blocks,
2024
})
2125
else:
2226
parsed_win = w90io.parse_win(contents)
2327
if args.parameters:
24-
pprint.pprint({
28+
pp.pprint({
2529
parameter: parsed_win['parameters'][parameter]
2630
for parameter in args.parameters if parameter in parsed_win['parameters']
2731
})
2832
if args.blocks:
29-
pprint.pprint({
33+
pp.pprint({
3034
block: parsed_win[block]
3135
for block in args.blocks if block in parsed_win['blocks']
3236
})
3337
if not args.parameters and not args.blocks:
34-
pprint.pprint(parsed_win)
38+
pp.pprint(parsed_win)
3539

3640

3741
def parse_wout_iteration_info(args):
3842
parsed_iteration_info = w90io.parse_iteration_info(args.file)
3943

4044
if args.convergence:
41-
pprint.pprint(parsed_iteration_info['convergence'])
45+
pp.pprint(parsed_iteration_info['convergence'])
4246

4347
if args.spread:
44-
pprint.pprint(parsed_iteration_info['spread'])
48+
pp.pprint(parsed_iteration_info['spread'])
4549

4650
if args.delta:
47-
pprint.pprint(parsed_iteration_info['delta'])
51+
pp.pprint(parsed_iteration_info['delta'])
4852

4953
if args.disentanglement:
50-
pprint.pprint(parsed_iteration_info['disentanglement'])
54+
pp.pprint(parsed_iteration_info['disentanglement'])
5155

5256
if not any([args.convergence, args.spread, args.delta, args.disentanglement]):
53-
pprint.pprint(parsed_iteration_info)
57+
pp.pprint(parsed_iteration_info)
5458

5559

5660
def parse_nnkp(args):
@@ -61,25 +65,25 @@ def parse_nnkp(args):
6165
blocks = w90io._core.extract_blocks(contents)
6266

6367
if args.extract_only:
64-
pprint.pprint({
68+
pp.pprint({
6569
'comments': comments,
6670
'parameters': parameters,
6771
'blocks': blocks,
6872
})
6973
else:
7074
parsed_nnkp = w90io.parse_nnkp(contents)
7175
if args.parameters:
72-
pprint.pprint({
76+
pp.pprint({
7377
parameter: parsed_nnkp['parameters'][parameter]
7478
for parameter in args.parameters if parameter in parsed_nnkp['parameters']
7579
})
7680
if args.blocks:
77-
pprint.pprint({
81+
pp.pprint({
7882
block: parsed_nnkp[block]
7983
for block in args.blocks if block in parsed_nnkp['blocks']
8084
})
8185
if not args.parameters and not args.blocks:
82-
pprint.pprint(parsed_nnkp)
86+
pp.pprint(parsed_nnkp)
8387

8488

8589
def info_amn(args):

0 commit comments

Comments
 (0)