lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <tencent_F3895D0EA868BCCE8C56221619BC093D660A@qq.com>
Date:   Wed, 21 Jun 2023 15:33:30 +0800
From:   Rong Tao <rtoax@...mail.com>
To:     martin.petersen@...cle.com
Cc:     rongtao@...tc.cn, Jonathan Corbet <corbet@....net>,
        linux-scsi@...r.kernel.org (open list:SCSI TARGET SUBSYSTEM),
        target-devel@...r.kernel.org (open list:SCSI TARGET SUBSYSTEM),
        linux-doc@...r.kernel.org (open list:DOCUMENTATION),
        linux-kernel@...r.kernel.org (open list)
Subject: [PATCH] docs: target: Convert tcm_mod_builder.py print syntax to python3

From: Rong Tao <rongtao@...tc.cn>

Convert the tcm_mod_builder.py file to python3 and fix indentation.

Error:

    $ ./tcm_mod_builder.py
    File "/home/sda/git-repos/linux/Documentation/target/./tcm_mod_builder.py", line 23
        print msg
            ^
    SyntaxError: Missing parentheses in call to 'print'. Did you mean print(msg)?

    $ ./tcm_mod_builder.py
    File "/home/sda/git-repos/linux/Documentation/target/./tcm_mod_builder.py", line 186
        p = open(f, 'w');
    TabError: inconsistent use of tabs and spaces in indentation

Signed-off-by: Rong Tao <rongtao@...tc.cn>
---
 Documentation/target/tcm_mod_builder.py | 44 ++++++++++++-------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/Documentation/target/tcm_mod_builder.py b/Documentation/target/tcm_mod_builder.py
index 54492aa813b9..e2ef72925de3 100755
--- a/Documentation/target/tcm_mod_builder.py
+++ b/Documentation/target/tcm_mod_builder.py
@@ -20,7 +20,7 @@ fabric_mod_port = ""
 fabric_mod_init_port = ""
 
 def tcm_mod_err(msg):
-	print msg
+	print(msg)
 	sys.exit(1)
 
 def tcm_mod_create_module_subdir(fabric_mod_dir_var):
@@ -28,7 +28,7 @@ def tcm_mod_create_module_subdir(fabric_mod_dir_var):
 	if os.path.isdir(fabric_mod_dir_var) == True:
 		return 1
 
-	print "Creating fabric_mod_dir: " + fabric_mod_dir_var
+	print("Creating fabric_mod_dir: " + fabric_mod_dir_var)
 	ret = os.mkdir(fabric_mod_dir_var)
 	if ret:
 		tcm_mod_err("Unable to mkdir " + fabric_mod_dir_var)
@@ -41,7 +41,7 @@ def tcm_mod_build_FC_include(fabric_mod_dir_var, fabric_mod_name):
 	buf = ""
 
 	f = fabric_mod_dir_var + "/" + fabric_mod_name + "_base.h"
-	print "Writing file: " + f
+	print("Writing file: " + f)
 
 	p = open(f, 'w');
 	if not p:
@@ -85,7 +85,7 @@ def tcm_mod_build_SAS_include(fabric_mod_dir_var, fabric_mod_name):
 	buf = ""
 
 	f = fabric_mod_dir_var + "/" + fabric_mod_name + "_base.h"
-	print "Writing file: " + f
+	print("Writing file: " + f)
 
 	p = open(f, 'w');
 	if not p:
@@ -128,7 +128,7 @@ def tcm_mod_build_iSCSI_include(fabric_mod_dir_var, fabric_mod_name):
 	buf = ""
 
 	f = fabric_mod_dir_var + "/" + fabric_mod_name + "_base.h"
-	print "Writing file: " + f
+	print("Writing file: " + f)
 
 	p = open(f, 'w');
 	if not p:
@@ -172,7 +172,7 @@ def tcm_mod_build_base_includes(proto_ident, fabric_mod_dir_val, fabric_mod_name
 	elif proto_ident == "iSCSI":
 		tcm_mod_build_iSCSI_include(fabric_mod_dir_val, fabric_mod_name)
 	else:
-		print "Unsupported proto_ident: " + proto_ident
+		print("Unsupported proto_ident: " + proto_ident)
 		sys.exit(1)
 
 	return
@@ -181,11 +181,11 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
 	buf = ""
 
 	f = fabric_mod_dir_var + "/" + fabric_mod_name + "_configfs.c"
-	print "Writing file: " + f
+	print("Writing file: " + f)
 
-        p = open(f, 'w');
-        if not p:
-                tcm_mod_err("Unable to open file: " + f)
+	p = open(f, 'w');
+	if not p:
+		tcm_mod_err("Unable to open file: " + f)
 
 	buf = "#include <linux/module.h>\n"
 	buf += "#include <linux/moduleparam.h>\n"
@@ -339,7 +339,7 @@ def tcm_mod_scan_fabric_ops(tcm_dir):
 
 	fabric_ops_api = tcm_dir + "include/target/target_core_fabric.h"
 
-	print "Using tcm_mod_scan_fabric_ops: " + fabric_ops_api
+	print("Using tcm_mod_scan_fabric_ops: " + fabric_ops_api)
 	process_fo = 0;
 
 	p = open(fabric_ops_api, 'r')
@@ -375,14 +375,14 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):
 	bufi = ""
 
 	f = fabric_mod_dir_var + "/" + fabric_mod_name + "_fabric.c"
-	print "Writing file: " + f
+	print("Writing file: " + f)
 
 	p = open(f, 'w')
 	if not p:
 		tcm_mod_err("Unable to open file: " + f)
 
 	fi = fabric_mod_dir_var + "/" + fabric_mod_name + "_fabric.h"
-	print "Writing file: " + fi
+	print("Writing file: " + fi)
 
 	pi = open(fi, 'w')
 	if not pi:
@@ -537,7 +537,7 @@ def tcm_mod_build_kbuild(fabric_mod_dir_var, fabric_mod_name):
 
 	buf = ""
 	f = fabric_mod_dir_var + "/Makefile"
-	print "Writing file: " + f
+	print("Writing file: " + f)
 
 	p = open(f, 'w')
 	if not p:
@@ -558,7 +558,7 @@ def tcm_mod_build_kconfig(fabric_mod_dir_var, fabric_mod_name):
 
 	buf = ""
 	f = fabric_mod_dir_var + "/Kconfig"
-	print "Writing file: " + f
+	print("Writing file: " + f)
 
 	p = open(f, 'w')
 	if not p:
@@ -603,20 +603,20 @@ def main(modname, proto_ident):
 
 	tcm_dir = os.getcwd();
 	tcm_dir += "/../../"
-	print "tcm_dir: " + tcm_dir
+	print("tcm_dir: " + tcm_dir)
 	fabric_mod_name = modname
 	fabric_mod_dir = tcm_dir + "drivers/target/" + fabric_mod_name
-	print "Set fabric_mod_name: " + fabric_mod_name
-	print "Set fabric_mod_dir: " + fabric_mod_dir
-	print "Using proto_ident: " + proto_ident
+	print("Set fabric_mod_name: " + fabric_mod_name)
+	print("Set fabric_mod_dir: " + fabric_mod_dir)
+	print("Using proto_ident: " + proto_ident)
 
 	if proto_ident != "FC" and proto_ident != "SAS" and proto_ident != "iSCSI":
-		print "Unsupported proto_ident: " + proto_ident
+		print("Unsupported proto_ident: " + proto_ident)
 		sys.exit(1)
 
 	ret = tcm_mod_create_module_subdir(fabric_mod_dir)
 	if ret:
-		print "tcm_mod_create_module_subdir() failed because module already exists!"
+		print("tcm_mod_create_module_subdir() failed because module already exists!")
 		sys.exit(1)
 
 	tcm_mod_build_base_includes(proto_ident, fabric_mod_dir, fabric_mod_name)
@@ -647,7 +647,7 @@ parser.add_option('-p', '--protoident', help='Protocol Ident', dest='protoident'
 mandatories = ['modname', 'protoident']
 for m in mandatories:
 	if not opts.__dict__[m]:
-		print "mandatory option is missing\n"
+		print("mandatory option is missing\n")
 		parser.print_help()
 		exit(-1)
 
-- 
2.39.3

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ