Merge pull request #965 from r4f4/fix-tools-py2

fixes #962 - fix lambda on both py2 and py3

tools/uobjnew.py

@@ -147,13 +147,13 @@ while True:
     print()
     data = bpf["allocs"]
     if args.top_count:
-        data = sorted(data.items(), key=lambda k, v: v.num_allocs)
+        data = sorted(data.items(), key=lambda kv: kv[1].num_allocs)
         data = data[-args.top_count:]
     elif args.top_size:
-        data = sorted(data.items(), key=lambda k, v: v.total_size)
+        data = sorted(data.items(), key=lambda kv: kv[1].total_size)
         data = data[-args.top_size:]
     else:
-        data = sorted(data.items(), key=lambda k, v: v.total_size)
+        data = sorted(data.items(), key=lambda kv: kv[1].total_size)
     print("%-30s %8s %12s" % ("TYPE", "# ALLOCS", "# BYTES"))
     for key, value in data:
         if args.language == "c":

tools/ustat.py

@@ -244,10 +244,10 @@ class Tool(object):
             counts.update(probe.get_counts(self.bpf))
             targets.update(probe.targets)
         if self.args.sort:
-            counts = sorted(counts.items(), key=lambda _, v:
-                            -v.get(self.args.sort.upper(), 0))
+            counts = sorted(counts.items(), key=lambda kv:
+                            -kv[1].get(self.args.sort.upper(), 0))
         else:
-            counts = sorted(counts.items(), key=lambda k, _: k)
+            counts = sorted(counts.items(), key=lambda kv: kv[0])
         for pid, stats in counts:
             print("%-6d %-20s %-10d %-6d %-10d %-8d %-6d %-6d" % (
                   pid, targets[pid][:20],