From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D95A0A04B5; Wed, 30 Sep 2020 13:46:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 294D61DA97; Wed, 30 Sep 2020 13:45:33 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 1A88C1D6F8 for ; Wed, 30 Sep 2020 13:45:23 +0200 (CEST) IronPort-SDR: ngMFUaXvfNpyBD5K3i7SCgeHB5ii+7bD3FnttiVLfkTzlo2Q6x36Qj5abreU8A/S/aDAjgmtFL 6xKwGZsMYUwg== X-IronPort-AV: E=McAfee;i="6000,8403,9759"; a="224022557" X-IronPort-AV: E=Sophos;i="5.77,322,1596524400"; d="scan'208";a="224022557" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2020 04:45:22 -0700 IronPort-SDR: FA4LWp1lRb9uwctQm3fsWpKJ6gkDZcde73sawRkMxcMJMqRL9l9T5e6sQ0TgErONdkBbRS6++o C8YJ+BnnJRsw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,322,1596524400"; d="scan'208";a="350647801" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by FMSMGA003.fm.intel.com with ESMTP; 30 Sep 2020 04:45:20 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchand@redhat.com, stephen@networkplumber.org, Louise Kilheeney , Kevin Laatz Date: Wed, 30 Sep 2020 12:40:14 +0100 Message-Id: <20200930114024.446473-2-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200930114024.446473-1-kevin.laatz@intel.com> References: <20200929102224.440322-1-kevin.laatz@intel.com> <20200930114024.446473-1-kevin.laatz@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v10 01/11] usertools/dpdk-telemetry: support python3 only X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Louise Kilheeney Changed script to explicitly use python3 only to avoid maintaining python 2 and removed deprecation notice. Cc: Kevin Laatz Signed-off-by: Louise Kilheeney Signed-off-by: Kevin Laatz Acked-by: Bruce Richardson Acked-by: Robin Jarry Acked-by: Stephen Hemminger --- v8: removed cleanup not related to python3 only support v10: fix direct call to directly call to /usr/bin/python3 in dpdk-telemetry.py --- usertools/dpdk-telemetry-client.py | 18 +++--------------- usertools/dpdk-telemetry.py | 2 +- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/usertools/dpdk-telemetry-client.py b/usertools/dpdk-telemetry-client.py index 98d28fa89b..d8e439027c 100755 --- a/usertools/dpdk-telemetry-client.py +++ b/usertools/dpdk-telemetry-client.py @@ -1,10 +1,7 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -from __future__ import print_function -from __future__ import unicode_literals - import socket import os import sys @@ -18,15 +15,6 @@ GLOBAL_METRICS_REQ = "{\"action\":0,\"command\":\"global_stat_values\",\"data\":null}" DEFAULT_FP = "/var/run/dpdk/default_client" -try: - raw_input # Python 2 -except NameError: - raw_input = input # Python 3 - -if sys.version_info.major < 3: - print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr) - print("Please use Python 3 instead", file=sys.stderr) - class Socket: def __init__(self): @@ -86,7 +74,7 @@ def requestMetrics(self): # Requests metrics for given client def repeatedlyRequestMetrics(self, sleep_time): # Recursively requests metrics for given client print("\nPlease enter the number of times you'd like to continuously request Metrics:") - n_requests = int(raw_input("\n:")) + n_requests = int(input("\n:")) print("\033[F") #Removes the user input from screen, cleans it up print("\033[K") for i in range(n_requests): @@ -107,7 +95,7 @@ def interactiveMenu(self, sleep_time): # Creates Interactive menu within the scr print("[4] Unregister client") try: - self.choice = int(raw_input("\n:")) + self.choice = int(input("\n:")) print("\033[F") #Removes the user input for screen, cleans it up print("\033[K") if self.choice == 1: diff --git a/usertools/dpdk-telemetry.py b/usertools/dpdk-telemetry.py index 8e4039d574..181859658f 100755 --- a/usertools/dpdk-telemetry.py +++ b/usertools/dpdk-telemetry.py @@ -1,4 +1,4 @@ -#! /usr/bin/python3 +#! /usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2020 Intel Corporation -- 2.25.1