[dpdk-stable] patch 'usertools: fix CPU layout script to be PEP8 compliant' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/19/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/42df599aa85490c1727692b4d7ad5d8b3d8e22b9

Thanks.

Luca Boccassi

---
>From 42df599aa85490c1727692b4d7ad5d8b3d8e22b9 Mon Sep 17 00:00:00 2001
From: Ciara Power <ciara.power at intel.com>
Date: Fri, 6 Nov 2020 12:40:53 +0000
Subject: [PATCH] usertools: fix CPU layout script to be PEP8 compliant

[ upstream commit b0dcd610529487ed6661351a735a35af5d03a222 ]

The pycodestyle tool flagged the following issues, which are now fixed.

$ pycodestyle cpu_layout.py
  cpu_layout.py:18:5: E722 do not use bare 'except'
  cpu_layout.py:62:14: E231 missing whitespace after ','

Fixes: deb87e6777c0 ("usertools: use sysfs for CPU layout")
Fixes: c9208f1dc967 ("usertools: fix CPU layout with python 3")

Signed-off-by: Ciara Power <ciara.power at intel.com>
---
 usertools/cpu_layout.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py
index 6f129b1db8..39b268752a 100755
--- a/usertools/cpu_layout.py
+++ b/usertools/cpu_layout.py
@@ -22,8 +22,6 @@ for cpu in xrange(max_cpus + 1):
         fd = open("{}/cpu{}/topology/core_id".format(base_path, cpu))
     except IOError:
         continue
-    except:
-        break
     core = int(fd.read())
     fd.close()
     fd = open("{}/cpu{}/topology/physical_package_id".format(base_path, cpu))
@@ -66,7 +64,7 @@ print(output)
 for c in cores:
     output = "Core %s" % str(c).ljust(max_core_id_len)
     for s in sockets:
-        if (s,c) in core_map:
+        if (s, c) in core_map:
             output += " " + str(core_map[(s, c)]).ljust(max_core_map_len)
         else:
             output += " " * (max_core_map_len + 1)
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-17 11:13:13.406915293 +0000
+++ 0010-usertools-fix-CPU-layout-script-to-be-PEP8-compliant.patch	2020-11-17 11:13:12.873115642 +0000
@@ -1 +1 @@
-From b0dcd610529487ed6661351a735a35af5d03a222 Mon Sep 17 00:00:00 2001
+From 42df599aa85490c1727692b4d7ad5d8b3d8e22b9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b0dcd610529487ed6661351a735a35af5d03a222 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index cc39638213..891b9238fa 100755
+index 6f129b1db8..39b268752a 100755
@@ -25 +26 @@
-@@ -15,8 +15,6 @@ for cpu in range(max_cpus + 1):
+@@ -22,8 +22,6 @@ for cpu in xrange(max_cpus + 1):
@@ -34 +35 @@
-@@ -59,7 +57,7 @@ print(output)
+@@ -66,7 +64,7 @@ print(output)