Skip to content

Commit

Permalink
tc: python3, string formattings
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
BTaskaya authored and David S. Miller committed Feb 26, 2018
1 parent ed820f4 commit 3adc1c6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tools/testing/selftests/tc-testing/tdc.py
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,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:
Expand Down
8 changes: 4 additions & 4 deletions tools/testing/selftests/tc-testing/tdc_batch.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@
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 ffff: flower %s "
"src_mac %s dst_mac %s action drop %s" %
cmd = ("filter add dev {} {} protocol ip parent ffff: 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()
Expand Down

0 comments on commit 3adc1c6

Please sign in to comment.