diff options
author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2018-04-13 09:13:16 -0400 |
---|---|---|
committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2018-05-02 11:28:46 +0000 |
commit | 4e7b423d3c3137c3f83b71b36279e1a544154833 (patch) | |
tree | e59dc57aa319a5e145161a0e32fba9fc74773e91 /xlators/experimental/fdl/src | |
parent | 9da91172538a2a95fba609c93e199db159fd1938 (diff) |
core/various: python3 compat, prepare for python2 -> python3
see https://review.gluster.org/#/c/19788/
use print fn from __future__
Change-Id: If5075d8d9ca9641058fbc71df8a52aa35804cda4
updates: #411
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'xlators/experimental/fdl/src')
-rwxr-xr-x | xlators/experimental/fdl/src/gen_dumper.py | 11 | ||||
-rwxr-xr-x | xlators/experimental/fdl/src/gen_fdl.py | 27 | ||||
-rwxr-xr-x | xlators/experimental/fdl/src/gen_recon.py | 11 |
3 files changed, 26 insertions, 23 deletions
diff --git a/xlators/experimental/fdl/src/gen_dumper.py b/xlators/experimental/fdl/src/gen_dumper.py index 2950be44e01..363ba6ce63f 100755 --- a/xlators/experimental/fdl/src/gen_dumper.py +++ b/xlators/experimental/fdl/src/gen_dumper.py @@ -1,5 +1,6 @@ #!/usr/bin/python2 +from __future__ import print_function import os import re import sys @@ -109,8 +110,8 @@ def load_fragments (path="recon-tmpl.c"): if __name__ == "__main__": fragments = load_fragments(sys.argv[1]) - print "/* BEGIN GENERATED CODE - DO NOT MODIFY */" - print fragments["PROLOG"] - print gen_functions() - print fragments["EPILOG"].replace("@SWITCH_BODY@",gen_cases()) - print "/* END GENERATED CODE */" + print("/* BEGIN GENERATED CODE - DO NOT MODIFY */") + print(fragments["PROLOG"]) + print(gen_functions()) + print(fragments["EPILOG"].replace("@SWITCH_BODY@",gen_cases())) + print("/* END GENERATED CODE */") diff --git a/xlators/experimental/fdl/src/gen_fdl.py b/xlators/experimental/fdl/src/gen_fdl.py index 136aa112861..d2e7dd5dfb2 100755 --- a/xlators/experimental/fdl/src/gen_fdl.py +++ b/xlators/experimental/fdl/src/gen_fdl.py @@ -1,5 +1,6 @@ #!/usr/bin/python2 +from __future__ import print_function import os import sys @@ -325,29 +326,29 @@ def gen_fdl (): fop_subs[name]["@LEN_CODE@"] = len_code[:-1] fop_subs[name]["@SER_CODE@"] = ser_code[:-1] if 'len' in gen_funcs: - print generate(LEN_TEMPLATE,name,fop_subs) + print(generate(LEN_TEMPLATE,name,fop_subs)) if 'serialize' in gen_funcs: - print generate(SER_TEMPLATE,name,fop_subs) + print(generate(SER_TEMPLATE,name,fop_subs)) if name == 'writev': - print "#define DESTAGE_ASYNC" + print("#define DESTAGE_ASYNC") if 'callback' in gen_funcs: - print generate(CBK_TEMPLATE,name,cbk_subs) + print(generate(CBK_TEMPLATE,name,cbk_subs)) if 'continue' in gen_funcs: - print generate(CONTINUE_TEMPLATE,name,fop_subs) + print(generate(CONTINUE_TEMPLATE,name,fop_subs)) if 'fop' in gen_funcs: - print generate(FOP_TEMPLATE,name,fop_subs) + print(generate(FOP_TEMPLATE,name,fop_subs)) if name == 'writev': - print "#undef DESTAGE_ASYNC" + print("#undef DESTAGE_ASYNC") entrypoints.append(name) - print "struct xlator_fops fops = {" + print("struct xlator_fops fops = {") for ep in entrypoints: - print "\t.%s = fdl_%s," % (ep, ep) - print "};" + print("\t.%s = fdl_%s," % (ep, ep)) + print("};") for l in open(sys.argv[1],'r').readlines(): if l.find('#pragma generate') != -1: - print "/* BEGIN GENERATED CODE - DO NOT MODIFY */" + print("/* BEGIN GENERATED CODE - DO NOT MODIFY */") gen_fdl() - print "/* END GENERATED CODE */" + print("/* END GENERATED CODE */") else: - print l[:-1] + print(l[:-1]) diff --git a/xlators/experimental/fdl/src/gen_recon.py b/xlators/experimental/fdl/src/gen_recon.py index af1765517f3..75323ea3dd9 100755 --- a/xlators/experimental/fdl/src/gen_recon.py +++ b/xlators/experimental/fdl/src/gen_recon.py @@ -1,5 +1,6 @@ #!/usr/bin/python2 +from __future__ import print_function import os import re import string @@ -210,8 +211,8 @@ def load_fragments (path="recon-tmpl.c"): if __name__ == "__main__": fragments = load_fragments(sys.argv[1]) - print "/* BEGIN GENERATED CODE - DO NOT MODIFY */" - print fragments["PROLOG"] - print gen_functions() - print fragments["EPILOG"].replace("@SWITCH_BODY@",gen_cases()) - print "/* END GENERATED CODE */" + print("/* BEGIN GENERATED CODE - DO NOT MODIFY */") + print(fragments["PROLOG"]) + print(gen_functions()) + print(fragments["EPILOG"].replace("@SWITCH_BODY@",gen_cases())) + print("/* END GENERATED CODE */") |