[v10,04/11] usertools/cpu_layout: 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.
Signed-off-by: Louise Kilheeney <louise.kilheeney@intel.com>
Reviewed-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Robin Jarry <robin.jarry@6wind.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
usertools/cpu_layout.py | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
Comments
On Wed, Sep 30, 2020 at 1:45 PM Kevin Laatz <kevin.laatz@intel.com> wrote:
>
> From: Louise Kilheeney <louise.kilheeney@intel.com>
>
> Changed script to explicitly use python3 only to avoid
> maintaining python 2 and removed deprecation notice.
>
> Signed-off-by: Louise Kilheeney <louise.kilheeney@intel.com>
> Reviewed-by: Bruce Richardson <bruce.richardson@intel.com>
> Acked-by: Robin Jarry <robin.jarry@6wind.com>
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
> usertools/cpu_layout.py | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py
> index 5423c7965f..89a48cec46 100755
> --- a/usertools/cpu_layout.py
> +++ b/usertools/cpu_layout.py
> @@ -1,18 +1,9 @@
> -#!/usr/bin/env python
> +#!/usr/bin/env python3
> # SPDX-License-Identifier: BSD-3-Clause
> # Copyright(c) 2010-2014 Intel Corporation
> # Copyright(c) 2017 Cavium, Inc. All rights reserved.
>
> -from __future__ import print_function
> import sys
sys is not needed anymore.
Fixed while applying.
> -try:
> - xrange # Python 2
> -except NameError:
> - xrange = range # 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)
>
> sockets = []
> cores = []
@@ -1,18 +1,9 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2010-2014 Intel Corporation
# Copyright(c) 2017 Cavium, Inc. All rights reserved.
-from __future__ import print_function
import sys
-try:
- xrange # Python 2
-except NameError:
- xrange = range # 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)
sockets = []
cores = []
@@ -21,7 +12,7 @@
fd = open("{}/kernel_max".format(base_path))
max_cpus = int(fd.read())
fd.close()
-for cpu in xrange(max_cpus + 1):
+for cpu in range(max_cpus + 1):
try:
fd = open("{}/cpu{}/topology/core_id".format(base_path, cpu))
except IOError: