mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 14:11:52 +00:00
show_delta: Update script to support python versions 2.5 through 3.3
Support past and active versions of python while maintaining backward compatibility. Script has been tested on python versions from 2.5.x up to and including 3.3.x. Signed-off-by: Mike Pagano <mpagano@gentoo.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
parent
a690876385
commit
f29b5f3e6f
@ -13,7 +13,7 @@ import sys
|
||||
import string
|
||||
|
||||
def usage():
|
||||
print """usage: show_delta [<options>] <filename>
|
||||
print ("""usage: show_delta [<options>] <filename>
|
||||
|
||||
This program parses the output from a set of printk message lines which
|
||||
have time data prefixed because the CONFIG_PRINTK_TIME option is set, or
|
||||
@ -35,7 +35,7 @@ ex: $ dmesg >timefile
|
||||
|
||||
will show times relative to the line in the kernel output
|
||||
starting with "NET4".
|
||||
"""
|
||||
""")
|
||||
sys.exit(1)
|
||||
|
||||
# returns a tuple containing the seconds and text for each message line
|
||||
@ -94,11 +94,11 @@ def main():
|
||||
try:
|
||||
lines = open(filein,"r").readlines()
|
||||
except:
|
||||
print "Problem opening file: %s" % filein
|
||||
print ("Problem opening file: %s" % filein)
|
||||
sys.exit(1)
|
||||
|
||||
if base_str:
|
||||
print 'base= "%s"' % base_str
|
||||
print ('base= "%s"' % base_str)
|
||||
# assume a numeric base. If that fails, try searching
|
||||
# for a matching line.
|
||||
try:
|
||||
@ -117,13 +117,13 @@ def main():
|
||||
# stop at first match
|
||||
break
|
||||
if not found:
|
||||
print 'Couldn\'t find line matching base pattern "%s"' % base_str
|
||||
print ('Couldn\'t find line matching base pattern "%s"' % base_str)
|
||||
sys.exit(1)
|
||||
else:
|
||||
base_time = 0.0
|
||||
|
||||
for line in lines:
|
||||
print convert_line(line, base_time),
|
||||
print (convert_line(line, base_time),)
|
||||
|
||||
main()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user