Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.xv2.15.29

1 files changed, 6 insertions, 0 deletions

diff --git a/wscript b/wscript
index 9cceb25cc..fefe14c60 100644
--- a/wscript
+++ b/wscript
@@ -39,6 +39,12 @@ APPNAME = 'dcpomatic'
 this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
 last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
 
+# Python 2/3 compatibility; I don't really understand what's going on here
+if not isinstance(this_version, str):
+    this_version = this_version.decode('utf-8')
+if not isinstance(last_version, str):
+    last_version = last_version.decode('utf-8')
+
 if this_version == '':
     VERSION = '%sdevel' % last_version[1:].strip()
 else: