summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-11-02 21:51:12 +0100
committerCarl Hetherington <cth@carlh.net>2019-11-02 21:51:12 +0100
commitd8490c68099fcc90896229fc8d26c758d09ce5d2 (patch)
tree5854819e8135ae26a2f5730118ead34896cb0ec3
parent20494e5589c4ddedc6e0a4f5d4dd00cc7fb56445 (diff)
Allow waf to be run with python 3.v0.1.5
-rw-r--r--wscript6
1 files changed, 4 insertions, 2 deletions
diff --git a/wscript b/wscript
index ff44e84..2dd7228 100644
--- a/wscript
+++ b/wscript
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
import subprocess
import shlex
import os
@@ -8,7 +10,7 @@ from waflib import Logs
APPNAME = 'libasdcp-cth'
if os.path.exists('.git'):
- this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
+ this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0].decode('utf-8')
last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
if this_version == '':
VERSION = '%sdevel' % last_version[1:].strip()
@@ -106,5 +108,5 @@ def tags(bld):
def dist(bld):
f = open('VERSION', 'w')
- print>>f,VERSION
+ print(VERSION, file=f)
f.close()