Python 3 fixes

Future proofing for compatibility with newer versions of Python.

Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #1838
This commit is contained in:
Matthew Thode
2013-11-08 15:53:54 -06:00
committed by Brian Behlendorf
parent 23bc1f91fc
commit 09d672d331
2 changed files with 19 additions and 14 deletions
+6 -6
View File
@@ -191,7 +191,7 @@ def prettynum(sz, scale, num=0):
return "%s" % num
# Rounding error, return 0
elif num > 0 and num < 1:
elif 0 < num < 1:
num = 0
while num > scale and index < 5:
@@ -259,10 +259,10 @@ def init():
"columns"
]
)
except getopt.error, msg:
except getopt.error as msg:
sys.stderr.write(msg)
usage()
opts = None
for opt, arg in opts:
if opt in ('-x', '--extended'):
@@ -335,7 +335,7 @@ def init():
out = open(opfile, "w")
sys.stdout = out
except:
except IOError:
sys.stderr.write("Cannot open %s for writing\n" % opfile)
sys.exit(1)
@@ -345,7 +345,7 @@ def calculate():
global v
global l2exist
v = {}
v = dict()
v["time"] = time.strftime("%H:%M:%S", time.localtime())
v["hits"] = d["hits"] / sint
v["miss"] = d["misses"] / sint
@@ -398,7 +398,7 @@ def calculate():
v["l2bytes"] = d["l2_read_bytes"] / sint
def sighandler(*args):
def sighandler():
sys.exit(0)