* [PATCH iptables v1] iptables-test.py: fix python3
@ 2019-05-24 20:02 Shekhar Sharma
2019-05-27 16:04 ` Phil Sutter
0 siblings, 1 reply; 3+ messages in thread
From: Shekhar Sharma @ 2019-05-24 20:02 UTC (permalink / raw)
To: netfilter-devel; +Cc: Shekhar Sharma
This patch converts the 'iptables-test.py' file (iptables/iptables-test.py) to run on
both python 2 and python3.
Do we need to add an argument for 'version' in the argument parser?
Signed-off-by: Shekhar Sharma <shekhar250198@gmail.com>
---
iptables-test.py | 43 ++++++++++++++++++++++---------------------
1 file changed, 22 insertions(+), 21 deletions(-)
diff --git a/iptables-test.py b/iptables-test.py
index 532dee7..8018b65 100755
--- a/iptables-test.py
+++ b/iptables-test.py
@@ -10,6 +10,7 @@
# This software has been sponsored by Sophos Astaro <http://www.sophos.com>
#
+from __future__ import print_function
import sys
import os
import subprocess
@@ -45,8 +46,8 @@ def print_error(reason, filename=None, lineno=None):
'''
Prints an error with nice colors, indicating file and line number.
'''
- print (filename + ": " + Colors.RED + "ERROR" +
- Colors.ENDC + ": line %d (%s)" % (lineno, reason))
+ print(filename + ": " + Colors.RED + "ERROR" +
+ Colors.ENDC + ": line {} ({})".format(lineno, reason))
def delete_rule(iptables, rule, filename, lineno):
@@ -79,7 +80,7 @@ def run_test(iptables, rule, rule_save, res, filename, lineno, netns):
cmd = iptables + " -A " + rule
if netns:
- cmd = "ip netns exec ____iptables-container-test " + EXECUTEABLE + " " + cmd
+ cmd = "ip netns exec ____iptables-container-test " + EXECUTEABLE + " {}".format(cmd)
ret = execute_cmd(cmd, filename, lineno)
@@ -88,7 +89,7 @@ def run_test(iptables, rule, rule_save, res, filename, lineno, netns):
#
if ret:
if res == "OK":
- reason = "cannot load: " + cmd
+ reason = "cannot load: {}".format(cmd)
print_error(reason, filename, lineno)
return -1
else:
@@ -96,7 +97,7 @@ def run_test(iptables, rule, rule_save, res, filename, lineno, netns):
return 0
else:
if res == "FAIL":
- reason = "should fail: " + cmd
+ reason = "should fail: {}".format(cmd)
print_error(reason, filename, lineno)
delete_rule(iptables, rule, filename, lineno)
return -1
@@ -119,10 +120,10 @@ def run_test(iptables, rule, rule_save, res, filename, lineno, netns):
command = EBTABLES_SAVE
path = os.path.abspath(os.path.curdir) + "/iptables/" + EXECUTEABLE
- command = path + " " + command
+ command = path + " {}".format(command)
if netns:
- command = "ip netns exec ____iptables-container-test " + command
+ command = "ip netns exec ____iptables-container-test {}".format(command)
args = splitted[1:]
proc = subprocess.Popen(command, shell=True,
@@ -134,7 +135,7 @@ def run_test(iptables, rule, rule_save, res, filename, lineno, netns):
# check for segfaults
#
if proc.returncode == -11:
- reason = "iptables-save segfaults: " + cmd
+ reason = "iptables-save segfaults: {}".format(cmd)
print_error(reason, filename, lineno)
delete_rule(iptables, rule, filename, lineno)
return -1
@@ -142,7 +143,7 @@ def run_test(iptables, rule, rule_save, res, filename, lineno, netns):
# find the rule
matching = out.find(rule_save)
if matching < 0:
- reason = "cannot find: " + iptables + " -I " + rule
+ reason = "cannot find: {}".format(iptables) + " -I {}".format(rule)
print_error(reason, filename, lineno)
delete_rule(iptables, rule, filename, lineno)
return -1
@@ -164,16 +165,16 @@ def execute_cmd(cmd, filename, lineno):
'''
global log_file
if cmd.startswith('iptables ') or cmd.startswith('ip6tables ') or cmd.startswith('ebtables ') or cmd.startswith('arptables '):
- cmd = os.path.abspath(os.path.curdir) + "/iptables/" + EXECUTEABLE + " " + cmd
+ cmd = os.path.abspath(os.path.curdir) + "/iptables/" + EXECUTEABLE + " {}".format(cmd)
- print >> log_file, "command: %s" % cmd
+ print("command: {}".format(cmd), file=log_file)
ret = subprocess.call(cmd, shell=True, universal_newlines=True,
stderr=subprocess.STDOUT, stdout=log_file)
log_file.flush()
# generic check for segfaults
if ret == -11:
- reason = "command segfaults: " + cmd
+ reason = "command segfaults: {}".format(cmd)
print_error(reason, filename, lineno)
return ret
@@ -232,7 +233,7 @@ def run_test_file(filename, netns):
if line[0] == "@":
external_cmd = line.rstrip()[1:]
if netns:
- external_cmd = "ip netns exec ____iptables-container-test " + external_cmd
+ external_cmd = "ip netns exec ____iptables-container-test {}".format(external_cmd)
execute_cmd(external_cmd, filename, lineno)
continue
@@ -240,7 +241,7 @@ def run_test_file(filename, netns):
if line[0] == "%":
external_cmd = line.rstrip()[1:]
if netns:
- external_cmd = "ip netns exec ____iptables-container-test " + EXECUTEABLE + " " + external_cmd
+ external_cmd = "ip netns exec ____iptables-container-test {}".format(EXECUTEABLE) + " {}".format(external_cmd)
execute_cmd(external_cmd, filename, lineno)
continue
@@ -249,7 +250,7 @@ def run_test_file(filename, netns):
continue
if len(chain_array) == 0:
- print "broken test, missing chain, leaving"
+ print("broken test, missing chain, leaving")
sys.exit()
test_passed = True
@@ -282,7 +283,7 @@ def run_test_file(filename, netns):
if netns:
execute_cmd("ip netns del ____iptables-container-test", filename, 0)
if total_test_passed:
- print filename + ": " + Colors.GREEN + "OK" + Colors.ENDC
+ print(filename + ": " + Colors.GREEN + "OK" + Colors.ENDC)
f.close()
return tests, passed
@@ -302,7 +303,7 @@ def show_missing():
missing = [test_name(i) for i in libfiles
if not test_name(i) in testfiles]
- print '\n'.join(missing)
+ print('\n'.join(missing))
#
@@ -336,7 +337,7 @@ def main():
EXECUTEABLE = "xtables-nft-multi"
if os.getuid() != 0:
- print "You need to be root to run this, sorry"
+ print("You need to be root to run this, sorry")
return
os.putenv("XTABLES_LIBDIR", os.path.abspath(EXTENSIONS_PATH))
@@ -351,7 +352,7 @@ def main():
try:
log_file = open(LOGFILE, 'w')
except IOError:
- print "Couldn't open log file %s" % LOGFILE
+ print("Couldn't open log file {}".format(LOGFILE))
return
file_list = [os.path.join(EXTENSIONS_PATH, i)
@@ -365,9 +366,9 @@ def main():
passed += file_passed
test_files += 1
- print ("%d test files, %d unit tests, %d passed" %
- (test_files, tests, passed))
+ print("{} test files, {} unit tests, {} passed".format(test_files, tests, passed))
if __name__ == '__main__':
main()
+
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH iptables v1] iptables-test.py: fix python3
2019-05-24 20:02 [PATCH iptables v1] iptables-test.py: fix python3 Shekhar Sharma
@ 2019-05-27 16:04 ` Phil Sutter
2019-05-27 22:06 ` shekhar sharma
0 siblings, 1 reply; 3+ messages in thread
From: Phil Sutter @ 2019-05-27 16:04 UTC (permalink / raw)
To: Shekhar Sharma; +Cc: netfilter-devel
Hi,
On Sat, May 25, 2019 at 01:32:06AM +0530, Shekhar Sharma wrote:
> This patch converts the 'iptables-test.py' file (iptables/iptables-test.py) to run on
> both python 2 and python3.
>
> Do we need to add an argument for 'version' in the argument parser?
You should insert questions between the '---' marker below and the
diffstat. This way they won't end up in the commit message.
Regarding your question: Assuming that iptables-test.py really is
version agnostic, why should users care which interpreter version is
used? Do you have a use-case in mind which justifies making the
interpreter version selectable via parameter?
[...]
> @@ -79,7 +80,7 @@ def run_test(iptables, rule, rule_save, res, filename, lineno, netns):
>
> cmd = iptables + " -A " + rule
> if netns:
> - cmd = "ip netns exec ____iptables-container-test " + EXECUTEABLE + " " + cmd
> + cmd = "ip netns exec ____iptables-container-test " + EXECUTEABLE + " {}".format(cmd)
Please respect the max column limit of 80 characters, even if the old
code exceeded it already.
Thanks, Phil
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH iptables v1] iptables-test.py: fix python3
2019-05-27 16:04 ` Phil Sutter
@ 2019-05-27 22:06 ` shekhar sharma
0 siblings, 0 replies; 3+ messages in thread
From: shekhar sharma @ 2019-05-27 22:06 UTC (permalink / raw)
To: Phil Sutter, Shekhar Sharma, netfilter-devel
Hi,
On Mon, May 27, 2019 at 9:34 PM Phil Sutter <phil@nwl.cc> wrote:
>
> Hi,
>
> On Sat, May 25, 2019 at 01:32:06AM +0530, Shekhar Sharma wrote:
> > This patch converts the 'iptables-test.py' file (iptables/iptables-test.py) to run on
> > both python 2 and python3.
> >
> > Do we need to add an argument for 'version' in the argument parser?
>
> You should insert questions between the '---' marker below and the
> diffstat. This way they won't end up in the commit message.
>
Sorry, will write the questions like that from now on.
> Regarding your question: Assuming that iptables-test.py really is
> version agnostic, why should users care which interpreter version is
> used? Do you have a use-case in mind which justifies making the
> interpreter version selectable via parameter?
>
True.
I don't have a use-case in mind right now.
> [...]
> > @@ -79,7 +80,7 @@ def run_test(iptables, rule, rule_save, res, filename, lineno, netns):
> >
> > cmd = iptables + " -A " + rule
> > if netns:
> > - cmd = "ip netns exec ____iptables-container-test " + EXECUTEABLE + " " + cmd
> > + cmd = "ip netns exec ____iptables-container-test " + EXECUTEABLE + " {}".format(cmd)
>
> Please respect the max column limit of 80 characters, even if the old
> code exceeded it already.
>
Sorry, will correct it.
> Thanks, Phil
Thank you for your comments!
Shekhar
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-27 22:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-24 20:02 [PATCH iptables v1] iptables-test.py: fix python3 Shekhar Sharma
2019-05-27 16:04 ` Phil Sutter
2019-05-27 22:06 ` shekhar sharma
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).