summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-12-17 22:16:38 +0100
committerCarl Hetherington <cth@carlh.net>2022-12-17 22:16:38 +0100
commitba4fd231e339bde0cd354194b51976513e4e8aa6 (patch)
tree12061a45abee158da2b3b7e403c7392126f0e789
parent684bb4b2f7f0b13c8050e87d6a8aed21a37a11cf (diff)
Another attempt to fix UTF-8/byte SNAFUs in wscript.v1.8.42
-rw-r--r--wscript8
1 files changed, 4 insertions, 4 deletions
diff --git a/wscript b/wscript
index ae73448d..41b6ea6a 100644
--- a/wscript
+++ b/wscript
@@ -40,13 +40,13 @@ from waflib import Logs, Context
APPNAME = 'libdcp'
-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].decode('UTF-8')
+this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE, encoding='UTF-8').communicate()[0]
+last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE, encoding='UTF-8').communicate()[0]
if this_version == '':
- VERSION = '%sdevel' % last_version[1:].strip().encode('UTF-8')
+ VERSION = '%sdevel' % last_version[1:].strip()
else:
- VERSION = this_version[1:].strip().encode('UTF-8')
+ VERSION = this_version[1:].strip()
API_VERSION = '-1.0'