Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-10 23:24:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Python 3 compatibility fix in internalize_scripts.py

Browse source
This commit is contained in:
adisbladis 2012-05-30 11:41:39 +02:00
parent 51f9ff5389
commit 6e3a823b7b
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
internalize_scripts.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/env python
import string, sys, os.path import string, sys, os.path
@ -47,16 +47,20 @@ class cfunc:
def cdef(self): def cdef(self):
result = "" result = ""
result += "static const char * const %s = \n\t" % self.cfunc_name() result += "static const char * const {0} = \n\t".format(self.cfunc_name())
result += '\n\t'.join(self.lines) result += '\n\t'.join(self.lines)
result += ';\n' result += ';\n'
return result return result
def cfunc_name(self): def cfunc_name(self):
# Translate - and . to underscore # Translate - and . to underscore
translator = string.maketrans('-.', '__') try: #Python 2
munged_name = string.translate(self.name, translator) translator = string.maketrans('-.', '__')
return "%s_%s" % (self.type, munged_name) munged_name = string.translate(self.name, translator)
except AttributeError: #Python 3
translator = "".maketrans('-.', '__')
munged_name = self.name.translate(translator)
return "{0}_{1}".format(self.type, munged_name)
TYPES = ['function', 'completion'] TYPES = ['function', 'completion']
type_to_funcs = dict((t, []) for t in TYPES) type_to_funcs = dict((t, []) for t in TYPES)
@ -71,7 +75,7 @@ for file in sys.argv[1:]:
# Try to figure out the file type (completion or function) # Try to figure out the file type (completion or function)
matches = [dir in dirname for dir in TYPES] matches = [dir in dirname for dir in TYPES]
if matches.count(True) is not 1: if matches.count(True) is not 1:
print "Cannot determine the type of the file at path %s" % file print("Cannot determine the type of the file at path {0}".format(file))
sys.exit(-1) sys.exit(-1)
type = TYPES[matches.index(True)] type = TYPES[matches.index(True)]
@ -81,7 +85,7 @@ for file in sys.argv[1:]:
type_to_funcs[type].append(newfunc) type_to_funcs[type].append(newfunc)
# Sort our functions by name # Sort our functions by name
for funcs in type_to_funcs.itervalues(): for funcs in type_to_funcs.values():
funcs.sort(key=cfunc.cfunc_name) funcs.sort(key=cfunc.cfunc_name)
# Output our header # Output our header
@ -97,7 +101,7 @@ fd.write('\n')
for type in TYPES: for type in TYPES:
funcs = type_to_funcs[type] funcs = type_to_funcs[type]
fd.write('\n') fd.write('\n')
fd.write('extern const struct builtin_script_t internal_%s_scripts[%d];' % (type, len(funcs))) fd.write('extern const struct builtin_script_t internal_{0}_scripts[{1}];'.format(type, len(funcs)))
fd.write('\n') fd.write('\n')
fd.close() fd.close()
@ -113,8 +117,8 @@ for type in TYPES:
# Output the refs # Output the refs
for type in TYPES: for type in TYPES:
funcs = type_to_funcs[type] funcs = type_to_funcs[type]
func_refs = ["{L%s, %s}" % (stringize(func.name), func.cfunc_name()) for func in funcs] func_refs = ["{0}L{1}, {2}{3}".format("{", stringize(func.name), func.cfunc_name(), "}") for func in funcs]
fd.write('const struct builtin_script_t internal_%s_scripts[%d] =\n' % (type, len(funcs))) fd.write('const struct builtin_script_t internal_{0}_scripts[{1}] =\n'.format(type, len(funcs)))
fd.write('{\n\t') fd.write('{\n\t')
fd.write(',\n\t'.join(func_refs)) fd.write(',\n\t'.join(func_refs))
fd.write('\n};\n') fd.write('\n};\n')