merge

tito · tito · commit c86c2a1967b6 · 2012-12-08T13:28:12.000+01:00
diff --git a/distribute.sh b/distribute.sh
@@ -19,7 +19,7 @@ if [ "X$PYTHON" == "X" ]; then
 fi
 
 # Paths
-ROOT_PATH="$(dirname $($PYTHON -c 'import os,sys;print os.path.realpath(sys.argv[1])' $0))"
+ROOT_PATH="$(dirname $($PYTHON -c 'from __future__ import print_function; import os,sys;print(os.path.realpath(sys.argv[1]))' $0))"
 RECIPES_PATH="$ROOT_PATH/recipes"
 BUILD_PATH="$ROOT_PATH/build"
 LIBS_PATH="$ROOT_PATH/build/libs"
@@ -142,7 +142,7 @@ function push_arm() {
 	export LDFLAGS="-lm"
 
 	# this must be something depending of the API level of Android
-	PYPLATFORM=$($PYTHON -c 'import sys; print sys.platform')
+	PYPLATFORM=$($PYTHON -c 'from __future__ import print_function; import sys; print(sys.platform)')
 	if [ "$PYPLATFORM" == "linux2" ]; then
 		PYPLATFORM="linux"
 	elif [ "$PYPLATFORM" == "linux3" ]; then
diff --git a/src/tools/biglink b/src/tools/biglink
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+from __future__ import print_function
 import os
 import sys
 import subprocess
@@ -39,10 +40,10 @@ while args:
         unique_args.insert(0, a)
 
 
-print 'Biglink create %s library' % sys.argv[1]
-print 'Biglink arguments:'
+print('Biglink create %s library' % sys.argv[1])
+print('Biglink arguments:')
 for arg in unique_args:
-    print '', arg
+    print(' %s' % arg)
 
 args = os.environ['CC'].split() + \
     ['-shared', '-O3', '-o', sys.argv[1]] + \
diff --git a/src/tools/liblink b/src/tools/liblink
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+from __future__ import print_function
 import sys
 import subprocess
 from os import environ
@@ -51,8 +52,8 @@ while i < len(sys.argv):
         continue
 
     if opt.startswith("-"):
-        print sys.argv
-        print "Unknown option: ", opt
+        print(sys.argv)
+        print("Unknown option: %s" % opt)
         sys.exit(1)
 
     if not opt.endswith('.o'):
@@ -61,12 +62,12 @@ while i < len(sys.argv):
     objects.append(opt)
 
 
-f = file(output, "w")
+f = open(output, "w")
 f.close()
 
 output = join(environ.get('LIBLINK_PATH'), basename(output))
 
-f = file(output + ".libs", "w")
+f = open(output + ".libs", "w")
 f.write(" ".join(libs))
 f.close()
 
