LBRYCommunity/kivy-ios
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #80 from olliwang/python3

Browse source 
Update print and open file statements for Python3 compatibility.
This commit is contained in:
Mathieu Virbel 2014-09-29 22:04:49 +02:00
commit d8ee195830
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/biglink
View file

@ -29,7 +29,7 @@ for fn in sofiles:
libsfn = fn + ".libs" libsfn = fn + ".libs"
args.append(afn) args.append(afn)
args.extend(file(libsfn).read().split(" ")) args.extend(open(libsfn).read().split(" "))
unique_args = [ ] unique_args = [ ]
@ -40,5 +40,5 @@ while args:
unique_args = ' '.join([ x for x in unique_args if x.endswith('.so.o') ]) unique_args = ' '.join([ x for x in unique_args if x.endswith('.so.o') ])
print 'Biglink create %s library' % sys.argv[1] print('Biglink create %s library' % sys.argv[1])
subprocess.Popen(("ar -q %s " % sys.argv[1]) + unique_args, shell=True).communicate() subprocess.Popen(("ar -q %s " % sys.argv[1]) + unique_args, shell=True).communicate()

14
tools/cythonize.py
View file

@ -18,7 +18,7 @@ def resolve_cython():
return return
def do(fn): def do(fn):
print 'cythonize:', fn print('cythonize:', fn)
parts = fn.split('/') parts = fn.split('/')
assert(parts[-1].endswith('.pyx')) assert(parts[-1].endswith('.pyx'))
if parts[0] == '.': if parts[0] == '.':
@ -30,7 +30,7 @@ def do(fn):
subprocess.Popen([cython, fn], env=os.environ).communicate() subprocess.Popen([cython, fn], env=os.environ).communicate()
if not package: if not package:
print 'no need to rewrite', fn print('no need to rewrite', fn)
else: else:
# get the .c, and change the initXXX # get the .c, and change the initXXX
fn_c = fn[:-3] + 'c' fn_c = fn[:-3] + 'c'
@ -44,19 +44,19 @@ def do(fn):
pat3 = 'Pyx_NAMESTR("{}")'.format(modname) pat3 = 'Pyx_NAMESTR("{}")'.format(modname)
sub3 = 'Pyx_NAMESTR("{}_{}")'.format(package, modname) sub3 = 'Pyx_NAMESTR("{}_{}")'.format(package, modname)
print '1: {} -> {}'.format(pat1, sub1) print('1: {} -> {}'.format(pat1, sub1))
print '2: {} -> {}'.format(pat2, sub2) print('2: {} -> {}'.format(pat2, sub2))
print '3: {} -> {}'.format(pat3, sub3) print('3: {} -> {}'.format(pat3, sub3))
data = data.replace(pat1, sub1) data = data.replace(pat1, sub1)
data = data.replace(pat2, sub2) data = data.replace(pat2, sub2)
data = data.replace(pat3, sub3) data = data.replace(pat3, sub3)
print 'rewrite', fn_c print('rewrite', fn_c)
with open(fn_c, 'w') as fd: with open(fn_c, 'w') as fd:
fd.write(data) fd.write(data)
if __name__ == '__main__': if __name__ == '__main__':
print '-- cythonize', sys.argv print('-- cythonize', sys.argv)
resolve_cython() resolve_cython()
for fn in sys.argv[1:]: for fn in sys.argv[1:]:
do(fn) do(fn)

12
tools/liblink
View file

@ -51,10 +51,10 @@ while i < len(sys.argv):
if opt.startswith('-arch'): if opt.startswith('-arch'):
continue continue
if opt.startswith("-"): if opt.startswith("-"):
print sys.argv print(sys.argv)
print "Unknown option: ", opt print("Unknown option: ", opt)
sys.exit(1) sys.exit(1)
if not opt.endswith('.o'): if not opt.endswith('.o'):
@ -63,14 +63,14 @@ while i < len(sys.argv):
objects.append(opt) objects.append(opt)
f = file(output, "w") f = open(output, "w")
f.close() f.close()
f = file(output + ".libs", "w") f = open(output + ".libs", "w")
f.write(" ".join(libs)) f.write(" ".join(libs))
f.close() f.close()
print 'Liblink redirect linking with', objects print('Liblink redirect linking with', objects)
subprocess.call([ subprocess.call([
environ.get('ARM_LD'), '-r', environ.get('ARM_LD'), '-r',
'-o', output + '.o', '-arch', 'armv7'] + objects) '-o', output + '.o', '-arch', 'armv7'] + objects)