From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 3066EA04A5;
Wed, 17 Jun 2020 17:11:37 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 0EF841B91B;
Wed, 17 Jun 2020 17:11:14 +0200 (CEST)
Received: from mga18.intel.com (mga18.intel.com [134.134.136.126])
by dpdk.org (Postfix) with ESMTP id 6A9AB5681
for <dev@dpdk.org>; Wed, 17 Jun 2020 17:11:06 +0200 (CEST)
IronPort-SDR: cUQsZwn+wUataZZo6Gm5VTMgysutsEXcQFGsWRw0AN14UQ+XURu2wTOxk4c01bH8rNHimEHV3Z
Rmx+GceNYyEQ==
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga008.jf.intel.com ([10.7.209.65])
by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
17 Jun 2020 08:11:06 -0700
IronPort-SDR: OVupFd6AMkMxft/dmREFUZht8sNsIz+FOWaIibtOTtxw8cf6hrfFTQyy93RCgAsleixBLzcS26
WGXBgr3XhFBg==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.73,523,1583222400"; d="scan'208";a="308822149"
Received: from silpixa00389033.ir.intel.com (HELO
silpixa00389033.ger.corp.intel.com) ([10.237.223.171])
by orsmga008.jf.intel.com with ESMTP; 17 Jun 2020 08:11:05 -0700
From: Louise Kilheeney <louise.kilheeney@intel.com>
To: dev@dpdk.org
Cc: robin.jarry@6wind.com, anatoly.burakov@intel.com,
bruce.richardson@intel.com, Louise Kilheeney <louise.kilheeney@intel.com>,
Kevin Laatz <kevin.laatz@intel.com>
Date: Wed, 17 Jun 2020 16:10:45 +0100
Message-Id: <20200617151051.21191-4-louise.kilheeney@intel.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20200617151051.21191-1-louise.kilheeney@intel.com>
References: <20200522132320.26373-1-louise.kilheeney@intel.com>
<20200617151051.21191-1-louise.kilheeney@intel.com>
Subject: [dpdk-dev] [PATCH v2 3/9] usertools/dpdk-telemetry-client: support
python3 only
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Changed script to explicitly use python3 only to avoid
maaintaining python 2.
Cc: Kevin Laatz <kevin.laatz@intel.com>
Signed-off-by: Louise Kilheeney <louise.kilheeney@intel.com>
---
usertools/dpdk-telemetry-client.py | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/usertools/dpdk-telemetry-client.py b/usertools/dpdk-telemetry-client.py
index 35edb7cd2..fa599046a 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,11 +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
-
class Socket:
def __init__(self):
@@ -49,7 +41,7 @@ def __init__(self): # Creates a client instance
def __del__(self):
try:
if self.unregistered == 0:
- self.unregister();
+ self.unregister()
except:
print("Error - Client could not be destroyed")
@@ -82,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):
@@ -103,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:
--
2.17.1