[v7,01/10] usertools/dpdk-telemetry-client: support python3 only
Checks
Commit Message
From: Louise Kilheeney <louise.kilheeney@intel.com>
Changed script to explicitly use python3 only to avoid
maintaining python 2 and removed deprecation notice.
Cc: Kevin Laatz <kevin.laatz@intel.com>
Signed-off-by: Louise Kilheeney <louise.kilheeney@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
usertools/dpdk-telemetry-client.py | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
Comments
Hi Kevin, all,
2020-09-21, Kevin Laatz:
> From: Louise Kilheeney <louise.kilheeney@intel.com>
>
> Changed script to explicitly use python3 only to avoid
> maintaining python 2 and removed deprecation notice.
>
> Cc: Kevin Laatz <kevin.laatz@intel.com>
>
> Signed-off-by: Louise Kilheeney <louise.kilheeney@intel.com>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
[snip]
> - self.unregister();
> + self.unregister()
Is this related to Python 3? If not, it may be better to make code
cleanups in a separate series.
> except:
> print("Error - Client could not be destroyed")
>
> @@ -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:
> --
> 2.25.1
>
@@ -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):
@@ -53,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")
@@ -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: