8000 merge · break123/python-for-android@c86c2a1 · GitHub
[go: up one dir, main page]
Skip to content

Commit c86c2a1

Browse files
titotito
committed
merge
2 parents caff228 + 0dc80e8 commit c86c2a1

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

‎distribute.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if [ "X$PYTHON" == "X" ]; then
1919
fi
2020

2121
# Paths
22-
ROOT_PATH="$(dirname $($PYTHON -c 'import os,sys;print os.path.realpath(sys.argv[1])' $0))"
22+
ROOT_PATH="$(dirname $($PYTHON -c 'from __future__ import print_function; import os,sys;print(os.path.realpath(sys.argv[1]))' $0))"
2323
RECIPES_PATH="$ROOT_PATH/recipes"
2424
BUILD_PATH="$ROOT_PATH/build"
2525
LIBS_PATH="$ROOT_PATH/build/libs"
@@ -142,7 +142,7 @@ function push_arm() {
142142
export LDFLAGS="-lm"
143143

144144
# this must be something depending of the API level of Android
145-
PYPLATFORM=$($PYTHON -c 'import sys; print sys.platform')
145+
PYPLATFORM=$($PYTHON -c 'from __future__ import print_function; import sys; print(sys.platform)')
146146
if [ "$PYPLATFORM" == "linux2" ]; then
147147
PYPLATFORM="linux"
148148
elif [ "$PYPLATFORM" == "linux3" ]; then

‎src/tools/biglink

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/usr/bin/env python
22

3+
from __future__ import print_function
34
import os
45
import sys
56
import subprocess
@@ -39,10 +40,10 @@ while args:
3940
unique_args.insert(0, a)
4041

4142

42-
print 'Biglink create %s library' % sys.argv[1]
43-
print 'Biglink arguments:'
43+
print('Biglink create %s library' % sys.argv[1])
44+
print('Biglink arguments:')
4445
for arg in unique_args:
45-
print '', arg
46+
print(' %s' % arg)
4647

4748
args = os.environ['CC'].split() + \
4849
['-shared', '-O3', '-o', sys.argv[1]] + \

‎src/tools/liblink

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/usr/bin/env python
22

3+
from __future__ import print_function
34
import sys
45
import subprocess
56
from os import environ
@@ -51,8 +52,8 @@ while i < len(sys.argv):
5152
continue
5253

5354
if opt.startswith("-"):
54-
print sys.argv
55-
print "Unknown option: ", opt
55+
print(sys.argv)
56+
print("Unknown option: %s" % opt)
5657
sys.exit(1)
5758

5859
if not opt.endswith('.o'):
@@ -61,12 +62,12 @@ while i < len(sys.argv):
6162
objects.append(opt)
6263

6364

64-
f = file(output, "w")
65+
f = open(output, "w")
6566
f.close()
6667

6768
output = join(environ.get('LIBLINK_PATH'), basename(output))
6869

69-
f = file(output + ".libs", "w")
70+
f = open(output + ".libs", "w")
7071
f.write(" ".join(libs))
7172
f.close()
7273

0 commit comments

Comments
 (0)
0