This changes the print statements to convert the file to run on both python2 and python3. Signed-off-by: Shekhar Sharma <shekhar250198@xxxxxxxxx> --- iptables-test.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/iptables-test.py b/iptables-test.py index 532dee7..233c4d6 100755 --- a/iptables-test.py +++ b/iptables-test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # (C) 2012-2013 by Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> # @@ -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,7 +46,7 @@ def print_error(reason, filename=None, lineno=None): ''' Prints an error with nice colors, indicating file and line number. ''' - print (filename + ": " + Colors.RED + "ERROR" + + print(filename + ": " + Colors.RED + "ERROR" + Colors.ENDC + ": line %d (%s)" % (lineno, reason)) @@ -166,7 +167,7 @@ def execute_cmd(cmd, filename, lineno): 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 - 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() @@ -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 %s" % LOGFILE) return file_list = [os.path.join(EXTENSIONS_PATH, i) @@ -365,8 +366,7 @@ def main(): passed += file_passed test_files += 1 - print ("%d test files, %d unit tests, %d passed" % - (test_files, tests, passed)) + print("%d test files, %d unit tests, %d passed" % (test_files, tests, passed)) if __name__ == '__main__': -- 2.17.1
