Merge pull request #435 from iovisor/bblanco_dev

Fix python3 incompatibilities

tools/dcstat.py

@@ -103,7 +103,7 @@ stats = {
 
 # header
 print("%-8s  " % "TIME", end="")
-for stype, idx in sorted(stats.iteritems(), key=lambda (k, v): (v, k)):
+for stype, idx in sorted(stats.items(), key=lambda k_v: (k_v[1], k_v[0])):
     print(" %8s" % (stype + "/s"), end="")
 print(" %8s" % "HIT%")
 
@@ -123,7 +123,7 @@ while (1):
     print("%-8s: " % strftime("%H:%M:%S"), end="")
 
     # print each statistic as a column
-    for stype, idx in sorted(stats.iteritems(), key=lambda (k, v): (v, k)):
+    for stype, idx in sorted(stats.items(), key=lambda k_v: (k_v[1], k_v[0])):
         try:
             val = b["stats"][c_int(idx)].value / interval
             print(" %8d" % val, end="")

tools/memleak.py

@@ -385,7 +385,7 @@ def print_outstanding():
 count_so_far = 0
 while True:
         if trace_all:
-                print bpf_program.trace_fields()
+                print(bpf_program.trace_fields())
         else:
                 try:
                         sleep(interval)