linux-kernel - Re: [PATCH 08/15] perf script python: add Python3 support to net

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190225123755.GA30699@hmswarspite.think-freely.org>
Date:   Mon, 25 Feb 2019 07:37:55 -0500
From:   Neil Horman <nhorman@...driver.com>
To:     Tony Jones <tonyj@...e.de>
Cc:     linux-kernel@...r.kernel.org, linux-perf-users@...r.kernel.org,
        acme@...nel.org, Seeteena Thoufeek <s1seetee@...ux.vnet.ibm.com>
Subject: Re: [PATCH 08/15] perf script python: add Python3 support to
 net_dropmonitor.py

On Fri, Feb 22, 2019 at 03:06:12PM -0800, Tony Jones wrote:
> Support both Python2 and Python3 in the net_dropmonitor.py script
> 
> There may be differences in the ordering of output lines due to
> differences in dictionary ordering etc.  However the format within lines
> should be unchanged.
> 
> The use of 'from __future__' implies the minimum supported Python2 version
> is now v2.6
> 
> Signed-off-by: Tony Jones <tonyj@...e.de>
> Signed-off-by: Seeteena Thoufeek <s1seetee@...ux.vnet.ibm.com>
> Cc: Neil Horman <nhorman@...driver.com>
> ---
>  tools/perf/scripts/python/net_dropmonitor.py | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/perf/scripts/python/net_dropmonitor.py b/tools/perf/scripts/python/net_dropmonitor.py
> index a150164b44a3..212557a02c50 100755
> --- a/tools/perf/scripts/python/net_dropmonitor.py
> +++ b/tools/perf/scripts/python/net_dropmonitor.py
> @@ -1,6 +1,8 @@
>  # Monitor the system for dropped packets and proudce a report of drop locations and counts
>  # SPDX-License-Identifier: GPL-2.0
>  
> +from __future__ import print_function
> +
>  import os
>  import sys
>  
> @@ -50,19 +52,19 @@ def get_sym(sloc):
>  		return (None, 0)
>  
>  def print_drop_table():
> -	print "%25s %25s %25s" % ("LOCATION", "OFFSET", "COUNT")
> +	print("%25s %25s %25s" % ("LOCATION", "OFFSET", "COUNT"))
>  	for i in drop_log.keys():
>  		(sym, off) = get_sym(i)
>  		if sym == None:
>  			sym = i
> -		print "%25s %25s %25s" % (sym, off, drop_log[i])
> +		print("%25s %25s %25s" % (sym, off, drop_log[i]))
>  
>  
>  def trace_begin():
> -	print "Starting trace (Ctrl-C to dump results)"
> +	print("Starting trace (Ctrl-C to dump results)")
>  
>  def trace_end():
> -	print "Gathering kallsyms data"
> +	print("Gathering kallsyms data")
>  	get_kallsyms_table()
>  	print_drop_table()
>  
> -- 
> 2.20.1
> 
> 
Acked-by: Neil Horman <nhorman@...driver.com>