Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Make arc_summary.py and dbufstat.py compatible with python3 

To make arc_summary.py and dbufstat.py compatible with python3
some minor fixes were required, this was done automatically by
`2to3 -w arc_summary.py` and `2to3 -w dbufstat.py`.

Signed-off-by: Hajo Möller <dasjoe@gmail.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Reviewed-by: Richard Laager <rlaager@wiktel.com>
This commit is contained in:
Hajo Möller 2016-01-01 02:20:43 +01:00 committed by Brian Behlendorf
parent 074348589b
commit 7cf2ffa020
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/arc_summary/arc_summary.py
View File

@ -94,7 +94,7 @@ def get_Kstat():
def div1(): def div1():
sys.stdout.write("\n") sys.stdout.write("\n")
for i in xrange(18): for i in range(18):
sys.stdout.write("%s" % "----") sys.stdout.write("%s" % "----")
sys.stdout.write("\n") sys.stdout.write("\n")
@ -1060,7 +1060,7 @@ def _tunable_summary(Kstat):
if alternate_tunable_layout: if alternate_tunable_layout:
format = "\t%s=%s\n" format = "\t%s=%s\n"
if show_tunable_descriptions and descriptions.has_key(name): if show_tunable_descriptions and name in descriptions:
sys.stdout.write("\t# %s\n" % descriptions[name]) sys.stdout.write("\t# %s\n" % descriptions[name])
sys.stdout.write(format % (name, values[name])) sys.stdout.write(format % (name, values[name]))
@ -1132,7 +1132,7 @@ def main():
if 'p' in args: if 'p' in args:
try: try:
pages.append(unSub[int(args['p']) - 1]) pages.append(unSub[int(args['p']) - 1])
except IndexError , e: except IndexError as e:
sys.stderr.write('the argument to -p must be between 1 and ' + sys.stderr.write('the argument to -p must be between 1 and ' +
str(len(unSub)) + '\n') str(len(unSub)) + '\n')
sys.exit() sys.exit()

6
cmd/dbufstat/dbufstat.py
View File

@ -386,9 +386,9 @@ def update_dict(d, k, line, labels):
def print_dict(d): def print_dict(d):
print_header() print_header()
for pool in d.keys(): for pool in list(d.keys()):
for objset in d[pool].keys(): for objset in list(d[pool].keys()):
for v in d[pool][objset].values(): for v in list(d[pool][objset].values()):
print_values(v) print_values(v)