Skip to content

Commit

Permalink
perf scripts python: Add Python 3 support to Util.py
Browse files Browse the repository at this point in the history
Support both Python 2 and Python 3 in Util.py. The dict class no longer
has a ``has_key`` method and print is now a function rather than a
statement. This should have no functional change.

Signed-off-by: Jeremy Cline <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Herton Krzesinski <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/0100016341a730c6-8db8b9b1-da2d-4ee3-96bf-47e0ae9796bd-000000@email.amazonses.com
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
  • Loading branch information
jeremycline authored and acmel committed Jul 11, 2018
1 parent 2ab8926 commit c45b168
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# This software may be distributed under the terms of the GNU General
# Public License ("GPL") version 2 as published by the Free Software
# Foundation.
from __future__ import print_function

import errno, os

Expand Down Expand Up @@ -33,7 +34,7 @@ def nsecs_str(nsecs):
return str

def add_stats(dict, key, value):
if not dict.has_key(key):
if key not in dict:
dict[key] = (value, value, value, 1)
else:
min, max, avg, count = dict[key]
Expand Down Expand Up @@ -72,10 +73,10 @@ def clear_term():
except:
if not audit_package_warned:
audit_package_warned = True
print "Install the audit-libs-python package to get syscall names.\n" \
"For example:\n # apt-get install python-audit (Ubuntu)" \
"\n # yum install audit-libs-python (Fedora)" \
"\n etc.\n"
print("Install the audit-libs-python package to get syscall names.\n"
"For example:\n # apt-get install python-audit (Ubuntu)"
"\n # yum install audit-libs-python (Fedora)"
"\n etc.\n")

def syscall_name(id):
try:
Expand Down

0 comments on commit c45b168

Please sign in to comment.