From ba4fd231e339bde0cd354194b51976513e4e8aa6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 17 Dec 2022 22:16:38 +0100 Subject: Another attempt to fix UTF-8/byte SNAFUs in wscript. --- wscript | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'wscript') 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' -- cgit v1.2.3