hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tc: python3, string formattings 

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 <batuhanosmantaskaya@gmail.com>

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
BTaskaya 2018-02-23 22:57:35 +03:00 committed by David S. Miller
parent ed820f47bc
commit 3adc1c63e2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/testing/selftests/tc-testing/tdc.py
View File

@ -445,7 +445,7 @@ def generate_case_ids(alltests):
for c in alltests: for c in alltests:
if (c["id"] == ""): if (c["id"] == ""):
while True: while True:
newid = str('%04x' % random.randrange(16**4)) newid = str('{:04x}'.format(random.randrange(16**4)))
if (does_id_exist(alltests, newid)): if (does_id_exist(alltests, newid)):
continue continue
else: else:

8
tools/testing/selftests/tc-testing/tdc_batch.py
View File

@ -49,13 +49,13 @@ index = 0
for i in range(0x100): for i in range(0x100):
for j in range(0x100): for j in range(0x100):
for k 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 src_mac = "e4:11:00:" + mac
dst_mac = "e4:12:00:" + mac dst_mac = "e4:12:00:" + mac
cmd = ("filter add dev %s %s protocol ip parent ffff: flower %s " cmd = ("filter add dev {} {} protocol ip parent ffff: flower {} "
"src_mac %s dst_mac %s action drop %s" % "src_mac {} dst_mac {} action drop {}".format
(device, prio, skip, src_mac, dst_mac, share_action)) (device, prio, skip, src_mac, dst_mac, share_action))
file.write("%s\n" % cmd) file.write("{}\n".format(cmd))
index += 1 index += 1
if index >= number: if index >= number:
file.close() file.close()