This patch converts old type string formattings to new type string
formattings for adapting Linux Traffic Control (tc) unit testing suite
python3.
Linux Traffic Control (tc) unit testing suite's code quality improved is
improved with this patch.
According to python documentation;
"The built-in string class provides the ability to do complex variable
substitutions and
value formatting via the format() method described in PEP 3101. "
but the project was using old type formattings and new type string formattings
together,
this patch's main purpose is converting all old types to new types.
Following files changed:
1. tools/testing/selftests/tc-testing/tdc.py
2. tools/testing/selftests/tc-testing/tdc_batch.py
Following PEP rules applied:
1. PEP8 - Code Styling
2. PEP3101 - Advanced Code Formatting
Signed-off-by: Batuhan Osman Taskaya
---
tools/testing/selftests/tc-testing/tdc.py | 2 +-
tools/testing/selftests/tc-testing/tdc_batch.py | 8
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/tc-testing/tdc.py
b/tools/testing/selftests/tc-testing/tdc.py
index fc373fdf2bdc..80c75464c67e 100755
--- a/tools/testing/selftests/tc-testing/tdc.py
+++ b/tools/testing/selftests/tc-testing/tdc.py
@@ -277,7 +277,7 @@ def generate_case_ids(alltests):
for c in alltests:
if (c["id"] == ""):
while True:
-newid = str('%04x' % random.randrange(16**4))
+newid = str('{:04x}'.format(random.randrange(16**4)))
if (does_id_exist(alltests, newid)):
continue
else:
diff --git a/tools/testing/selftests/tc-testing/tdc_batch.py
b/tools/testing/selftests/tc-testing/tdc_batch.py
index 707c6bfef689..52fa539dc662 100755
--- a/tools/testing/selftests/tc-testing/tdc_batch.py
+++ b/tools/testing/selftests/tc-testing/tdc_batch.py
@@ -49,13 +49,13 @@ index = 0
for i in range(0x100):
for j in range(0x100):
for k in range(0x100):
-mac = ("%02x:%02x:%02x" % (i, j, k))
+mac = ("{:02x}:{:02x}:{:02x}".format(i, j, k))
src_mac = "e4:11:00:" + mac
dst_mac = "e4:12:00:" + mac
-cmd = ("filter add dev %s %s protocol ip parent : flower %s "
- "src_mac %s dst_mac %s action drop %s" %
+cmd = ("filter add dev {} {} protocol ip parent : flower {} "
+ "src_mac {} dst_mac {} action drop {}".format
(device, prio, skip, src_mac, dst_mac, share_action))
-file.write("%s\n" % cmd)
+file.write("{}\n".format(cmd))
index += 1
if index >= number:
file.close()
--
2.16.1
