Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Jonathan Davies <jonathan.davies@nutanix.com>
To:     linux-kernel@vger.kernel.org
Cc:     Mike Pagano <mpagano@gentoo.org>, Michal Marek <mmarek@suse.cz>,
        Jonathan Davies <jonathan.davies@nutanix.com>
Subject: [PATCH] scripts/show_delta: port to python3
Date:   Thu, 17 Nov 2022 18:22:40 +0000
Message-Id: <20221117182240.39104-1-jonathan.davies@nutanix.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2RrmiZPp8l565GjM5GIxKIi0i7ONNQS8iVuLKqxrubH0SjCLLpvqpO0zvxiD?=
 =?us-ascii?Q?v1pfe9GG2+4W/m/iXPhGVYp6lv3QQoXREMsSFMTfKx5bzfukzTS3l2pg6CEV?=
 =?us-ascii?Q?wl9+VbRcr5XHaUnid62Q88RqWuEsx/ppcX+l26EXmH42RahdtEJF9e9ooZ6M?=
 =?us-ascii?Q?OEppWiuZg6IdnRd1QKfXKhAVb/EzidFHbu8I4BYVnA6QH/8alTsUT7NFaxEO?=
 =?us-ascii?Q?mvS68cBiiFk1Wxujqfrm182IwOXQUNvOjbq1VVtdZL9nv8GyYIhlu8q82ZZ7?=
 =?us-ascii?Q?W+vKi0op4wCwxeIC7m/eYGm92ih7cqT2QzohuF1zRJ+c49C3sQK4Vpk72b9G?=
 =?us-ascii?Q?0Y2uorpbIFpezY3qU4NHcJC6H1dTnJ1/+KEwSbOtheyukzmPTw1GT+TQeIZr?=
 =?us-ascii?Q?AqQDqi5YAD5NAm2w8SQXp9zy6vlICAxY62JoHKUiWHseZrHzslFdug72b8CG?=
 =?us-ascii?Q?yQ9yyFxmFY4sE0ihhZ6Zj+5fv9Qm80z0tw2iUfl/oMN9D+4zXI5zK+Ly6Tor?=
 =?us-ascii?Q?C0I5xtlIGBy1moVHQI3x4fV/+Lo8G2Y+9fuAzIXdaCuX23Ucl6OPhlswKGeL?=
 =?us-ascii?Q?biyeAeaUwU0IX10TOBvfvp73s8a91h8/HSyR49h/Jbvbt+JQx0tffDfaPdFm?=
 =?us-ascii?Q?V8GW/xNtNS8Eps/CutvnHP1bDYhE5QS7Vp89q4I8zvJLYIWU5aJeHc6KKQON?=
 =?us-ascii?Q?eWyGV1Z8WqnV6BtwATC8qrzfMu2GXyKjxqilyf1PwUHCcsqiNjVTYZ6iYult?=
 =?us-ascii?Q?RuP1tI5c7dDDSL5GlikTtgt7TmWErgnglkvM1cJSumyBh/2zS07KKtQDDtIy?=
 =?us-ascii?Q?hTpUcd/iIUw+Z7XFEM1Uo/1ZLg9LN8qzLEls22QVfLvA8DRR61OxXCrk35Lr?=
 =?us-ascii?Q?4rxHICNdXi4sOnvGWAS/pXdAFGrAqrM+HFBT2LibOoqv6XhLJgqcyOAmeXXi?=
 =?us-ascii?Q?hx0vPj9AZkn7BZKS8CFngR+BfRojnU13tx7KXGcKrqIbqSym2IrIT6AhZdet?=
 =?us-ascii?Q?CP42IwIdQjlHlXTzqm72ofKk7qhSuFgOdxE2OR8VDWVPCqouojx/zIz5znq5?=
 =?us-ascii?Q?F2OXU3GiwTvH3lmj4bneKVMgZUOtsiGecMXf5+0wa25/ytQwwcBl9Y+gjq8d?=
 =?us-ascii?Q?sCYUHhePxzAK5Erwymz3tkNyDkP2TvoKowtmhTSu8DCrld8sCL6M5zLWF04U?=
 =?us-ascii?Q?dU//8xRJECY7h3rfBy146jA5NIBaop9Z+yCphZ91UF2FRbrsYq5Z9Edvn8ix?=
 =?us-ascii?Q?Lf89xhrTS4o+nLEgLrNfeITWqWkQcoii71aibR2aZ2DcgDfGSqJYGezIy5+1?=
 =?us-ascii?Q?8O39ijlCoGNR7V+6dSd+B47gNPvtDrivbt7Xu9vfpaOkbv9Mf7H6yX7HcZRI?=
 =?us-ascii?Q?qBmNg1oSkwVznGYHIgzJzWE1f1RwyUpb/CnnFkYbIpFlgxzHmpTMAlHOEwFS?=
 =?us-ascii?Q?Y6i4g3XB0esQvNGwrPKNdEbkTpAqw6YqDzOKDAO+W8dliIPbcMnjd10fbtLH?=
 =?us-ascii?Q?Dgr0mfdlWFgPs3xpSYnDjvRNxNGFpSkanCJVzA9xtGCAVOwFSMGXzMPjJrRk?=
 =?us-ascii?Q?HMoAqswerP8mQvTT0BoQ8XGBvV7CcIO9OlsTNnMjXwiz0uEgv4CCO1FTECq7?=
 =?us-ascii?Q?Sg=3D=3D?=
X-OriginatorOrg: nutanix.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 77ddcacc-8d45-4649-bf28-08dac8c8c461
X-MS-Exchange-CrossTenant-AuthSource: CH0PR02MB7964.namprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2022 18:23:04.1196
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /HjF2fmjMSpxyH4Gte+TxsOwi8eV3/LWSRlfQpmeI8eagPi2Lgf3xe6dT2lTIuSQhrMYGJkVr/nN1CwuptwiQJg0B/frZwKAoHkTtTUBFWM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR02MB8676
X-Proofpoint-GUID: PbhMvOU3Cskf6vParM6xm9rVWAVGUJCR
X-Proofpoint-ORIG-GUID: PbhMvOU3Cskf6vParM6xm9rVWAVGUJCR
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-11-17_06,2022-11-17_01,2022-06-22_01
X-Proofpoint-Spam-Reason: safe
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,
        SPF_NONE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Although commit f29b5f3e6fc0 ("show_delta: Update script to support python
versions 2.5 through 3.3") claims that show_delta is python3-compatible, it
uses some functions that were removed in python3: string.split, string.atof
and string.find. Replace these with modern equivalents.

Also, to suppress newlines from print(), the 'end' parameter is now required.

With these changes, the script can be used under python3, so update the
shebang line to reflect this.

Signed-off-by: Jonathan Davies <jonathan.davies@nutanix.com>
---
 scripts/show_delta | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/show_delta b/scripts/show_delta
index 28e67e178194..10f0c9089611 100755
--- a/scripts/show_delta
+++ b/scripts/show_delta
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # SPDX-License-Identifier: GPL-2.0-only
 #
 # show_deltas: Read list of printk messages instrumented with
@@ -46,8 +46,8 @@ def get_time(line):
 		raise ValueError
 
 	# split on closing bracket
-	(time_str, rest) = string.split(line[1:],']',1)
-	time = string.atof(time_str)
+	(time_str, rest) = line[1:].split(']', 1)
+	time = float(time_str)
 
 	#print "time=", time
 	return (time, rest)
@@ -111,7 +111,7 @@ def main():
 					(time, rest) = get_time(line)
 				except:
 					continue
-				if string.find(rest, base_str)==1:
+				if rest.find(base_str)==1:
 					base_time = time
 					found = 1
 					# stop at first match
@@ -123,6 +123,6 @@ def main():
 		base_time = 0.0
 
 	for line in lines:
-		print (convert_line(line, base_time),)
+		print (convert_line(line, base_time), end='')
 
 main()
-- 
2.34.1